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

Commit abc22883 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Update task bar icon alignment logic when launcher is paused and... 

Merge "Update task bar icon alignment logic when launcher is paused and resumed in Overview" into tm-dev
parents 2b80d6f8 d4ed2f77

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

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

                || launcherStateChangedDuringAnimToResumeAlignment) {

            boolean isResumed = isResumed();

            float toAlignmentForResumedState = isResumed && goingToUnstashedLauncherState() ? 1 : 0;

            // If launcher is resumed, we show the icons when going to an unstashed launcher state

            // or launcher state is not changed (e.g. in overview, launcher is paused and resumed).

            float toAlignmentForResumedState = isResumed && (goingToUnstashedLauncherState()

                    || !goingToUnstashedLauncherStateChanged) ? 1 : 0;

            // If we're already animating to the value, just leave it be instead of restarting it.

            if (!mIconAlignmentForResumedState.isAnimatingToValue(toAlignmentForResumedState)) {

                ObjectAnimator resumeAlignAnim = mIconAlignmentForResumedState