| commit | a1734ad12e2f60ca5ff07dce91d670d5cab7eaf0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 14 03:23:40 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 14 03:23:40 2022 +0000 |
| tree | 9cb8aad5162e14499a748d50db50d1c05ebdc8c1 | |
| parent | 41ab3f3e14db8caa19bd19f955452a80cbb93893 [diff] | |
| parent | 14145d131a1a0773d547a5ed4f946fc5a38891a9 [diff] |
Merge "Update taskbar state when launcher pauses" into tm-qpr-dev
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 5178968..b9b4fc3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -173,7 +173,7 @@ } } - if (ENABLE_SHELL_TRANSITIONS + if (ENABLE_SHELL_TRANSITIONS && isResumed && !mLauncher.getStateManager().getState().isTaskbarAlignedWithHotseat(mLauncher)) { // Launcher is resumed, but in a state where taskbar is still independent, so // ignore the state change.