| commit | 8dedf2f6bca4478ef7828ed2cbbad08915a17435 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Dec 10 22:30:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 10 22:30:02 2021 +0000 |
| tree | 0d7a57e73f6446aa217a35e6350d4e14683fe8a4 | |
| parent | 48d82e2c19192546f8bb63761d30e0f71a880010 [diff] | |
| parent | 0e0e1cef09d0d671f1fc17baf7081c3a5bbe346f [diff] |
Merge "Fix taskbar being empty" into sc-v2-dev am: 0e0e1cef09 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16439570 Change-Id: I35766ede95fe4e73c883f7a187a23ba109ccb811
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 593bfd8..e2ba459 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -375,12 +375,12 @@ // 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);