Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa8cc97e authored by Jon Miranda's avatar Jon Miranda
Browse files

Revert "Fix bug where taskbar is translated during hotseat handoff." 

This reverts commit ecb55ef4.

Bug: 277942460
Test: tablet/foldable device
      check taskbar animation b/w states and during drag

Change-Id: I48e37d58afa6e168a683e1b9c73ae15432920030
parent ecb55ef4

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

+2 −8
Original line number Diff line number Diff line
@@ -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));

        }