commit 940f082825ccda93bea374c1933bf33f6398e5b9
author Jon Miranda <jonmiranda@google.com> Wed Apr 12 13:24:04 2023 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 14 01:03:11 2023 +0000
tree 3f58938ebbf3c0751393710369e255dde26c0631
parent a6e66aa900a099290c3a24836af4de19922365e6

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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fa8cc97e5f1229f567ee05bd531ce862b7d7ee73)
Merged-In: I48e37d58afa6e168a683e1b9c73ae15432920030
Change-Id: I48e37d58afa6e168a683e1b9c73ae15432920030

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index c9e7df4..58cb558 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -642,14 +642,8 @@
         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));
         }