From fa8cc97e5f1229f567ee05bd531ce862b7d7ee73 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Wed, 12 Apr 2023 13:24:04 -0700 Subject: [PATCH] Revert "Fix bug where taskbar is translated during hotseat handoff." This reverts commit ecb55ef4719fd8b25231225bf15b297f7afe047c. Bug: 277942460 Test: tablet/foldable device check taskbar animation b/w states and during drag Change-Id: I48e37d58afa6e168a683e1b9c73ae15432920030 --- .../taskbar/TaskbarLauncherStateController.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index c9e7df45a1..58cb558a40 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -642,14 +642,8 @@ public class TaskbarLauncherStateController { long resetDuration = mControllers.taskbarStashController.isInApp() ? duration : duration / 2; - boolean shouldReset = - mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration); - boolean goingToLauncher = isAnimatingToLauncher(); - boolean isNormalState = mLauncherState == LauncherState.NORMAL; - // Taskbar should always reset when animating to launcher in normal state to ensure there - // is no jump during the handoff to the hotseat. - if ((goingToLauncher && isNormalState) - || (shouldReset && (goingToLauncher || isNormalState))) { + if (mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration) + && (isAnimatingToLauncher() || mLauncherState == LauncherState.NORMAL)) { animatorSet.play(mControllers.taskbarTranslationController .createAnimToResetTranslation(resetDuration)); }