| commit | 957d46ae525ec4cdc059a3febd9b92ad6759d323 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jun 30 19:05:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 30 19:05:32 2023 +0000 |
| tree | d9d7be267cbd04bba758c758399cc724a57bcc6b | |
| parent | 18e0e1e50a7ca19c719561feeb4665d663655dcf [diff] | |
| parent | 4de15620c2fc885a9b6b6d4819fec9b083bc7905 [diff] |
Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev am: 2c3c1e46c0 am: 4de15620c2 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23852178 Change-Id: Idbb6ded338cf1fe3db8142ba75d54844a9bf1382 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 0b822fb..4ad3d5a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -202,6 +202,11 @@ public void onStateTransitionComplete(LauncherState finalState) { mLauncherState = finalState; updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, false); + // TODO(b/279514548) Cleans up bad state that can occur when user interacts with + // taskbar on top of transparent activity. + if (finalState == LauncherState.NORMAL && mLauncher.isResumed()) { + updateStateForFlag(FLAG_RESUMED, true); + } applyState(); boolean disallowLongClick = finalState == LauncherState.OVERVIEW_SPLIT_SELECT; com.android.launcher3.taskbar.Utilities.setOverviewDragState(