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

Commit a6e66aa9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9919854 from ecb55ef4 to tm-qpr3-release 

Change-Id: I4a77cab0d24ba5389866e8f48aedded560114976
parents 2ec08ebe ecb55ef4

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

+8 −2
Original line number Diff line number Diff line
@@ -642,8 +642,14 @@ public class TaskbarLauncherStateController { 
        long resetDuration = mControllers.taskbarStashController.isInApp()

                ? duration

                : duration / 2;

        if (mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration)

                && (isAnimatingToLauncher() || mLauncherState == LauncherState.NORMAL)) {

        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))) {

            animatorSet.play(mControllers.taskbarTranslationController

                    .createAnimToResetTranslation(resetDuration));

        }