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

Commit 3d206ca9 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix taskbar jumping when going home" into sc-v2-dev

parents 52ee4ec4 e59a723a

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

+8 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ import java.util.function.Supplier; 
        if (hasAnyFlag(changedFlags, FLAG_RESUMED)) {

            boolean isResumed = isResumed();

            ObjectAnimator anim = mIconAlignmentForResumedState

                    .animateToValue(getCurrentIconAlignmentRatio(), isResumed ? 1 : 0)

                    .animateToValue(isResumed ? 1 : 0)

                    .setDuration(duration);



            anim.addListener(new AnimatorListenerAdapter() {
@@ -351,9 +351,16 @@ import java.util.function.Supplier; 


        private void endGestureStateOverride(boolean finishedToApp) {

            mCallbacks.removeListener(this);



            // Update the resumed state immediately to ensure a seamless handoff

            boolean launcherResumed = !finishedToApp;

            mIconAlignmentForResumedState.updateValue(launcherResumed ? 1 : 0);



            updateStateForFlag(FLAG_RECENTS_ANIMATION_RUNNING, false);

            updateStateForFlag(FLAG_RESUMED, launcherResumed);

            applyState();





            TaskbarStashController controller = mControllers.taskbarStashController;

            controller.updateStateForFlag(FLAG_IN_APP, finishedToApp);

            controller.applyState();