| commit | 9fb88830175054405cca08d4c75f8b5947d0451f | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Feb 03 00:32:28 2023 +0000 |
| committer | Tony Wickham <twickham@google.com> | Fri Feb 03 01:00:21 2023 +0000 |
| tree | 62bab0e4188dd2494395752c0c390d275f47a22c | |
| parent | 68f56673381c079a103867d702778b47e1988748 [diff] |
Don't applyState if taskbar is already destroyed Test: Open overview while unfolded, then fold; ensure hotseat remains visible Fixes: 260135164 Change-Id: I788a9a682a7d5fabbea7c478231fc7abe92e95b9
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 8a5b2c5..f6c586c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -550,6 +550,10 @@ } } + public boolean isDestroyed() { + return mIsDestroyed; + } + public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) { mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags, fromInit);
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index d9773d4..f1b2bb2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -247,6 +247,9 @@ } public Animator applyState(long duration, boolean start) { + if (mControllers.taskbarActivityContext.isDestroyed()) { + return null; + } Animator animator = null; if (mPrevState == null || mPrevState != mState) { // If this is our initial state, treat all flags as changed.