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

Commit 8cf1e75a authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into... 

Merge changes from topic "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into tm-qpr-dev-plus-aosp am: 5523175f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22598537



Change-Id: I651b3a3fb06e9e4ee96266b0c1345b79cf958892
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94a8a8aa 5523175f

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

        }