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

Commit 8dedf2f6 authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Fix taskbar being empty" into sc-v2-dev am: 0e0e1cef 

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

Change-Id: I35766ede95fe4e73c883f7a187a23ba109ccb811
parents 48d82e2c 0e0e1cef

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

+3 −3
Original line number Diff line number Diff line
@@ -375,12 +375,12 @@ import java.util.function.Supplier; 


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



            // Set this last because applyState() might also animate it.

            mIconAlignmentForResumedState.cancelAnimation();

            mIconAlignmentForResumedState.updateValue(launcherResumed ? 1 : 0);



            TaskbarStashController controller = mControllers.taskbarStashController;

            controller.updateStateForFlag(FLAG_IN_APP, finishedToApp);