Merge "Fix taskbar being empty" into sc-v2-dev
This commit is contained in:
commit
0e0e1cef09
|
@ -375,12 +375,12 @@ import java.util.function.Supplier;
|
||||||
|
|
||||||
// Update the resumed state immediately to ensure a seamless handoff
|
// Update the resumed state immediately to ensure a seamless handoff
|
||||||
boolean launcherResumed = !finishedToApp;
|
boolean launcherResumed = !finishedToApp;
|
||||||
mIconAlignmentForResumedState.updateValue(launcherResumed ? 1 : 0);
|
|
||||||
|
|
||||||
updateStateForFlag(FLAG_RECENTS_ANIMATION_RUNNING, false);
|
updateStateForFlag(FLAG_RECENTS_ANIMATION_RUNNING, false);
|
||||||
updateStateForFlag(FLAG_RESUMED, launcherResumed);
|
updateStateForFlag(FLAG_RESUMED, launcherResumed);
|
||||||
applyState();
|
applyState();
|
||||||
|
// Set this last because applyState() might also animate it.
|
||||||
|
mIconAlignmentForResumedState.cancelAnimation();
|
||||||
|
mIconAlignmentForResumedState.updateValue(launcherResumed ? 1 : 0);
|
||||||
|
|
||||||
TaskbarStashController controller = mControllers.taskbarStashController;
|
TaskbarStashController controller = mControllers.taskbarStashController;
|
||||||
controller.updateStateForFlag(FLAG_IN_APP, finishedToApp);
|
controller.updateStateForFlag(FLAG_IN_APP, finishedToApp);
|
||||||
|
|
Loading…
Reference in New Issue