commit df537ccdb7eee3dfab6eb8cda662d26110e86279
author Jon Miranda <jonmiranda@google.com> Wed Jun 28 19:29:19 2023 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 30 23:26:22 2023 +0000
tree e2059fb6de080dedaaf5cda8a10c160efe13c2b7
parent 4fa7d267492d4e96339d0e9a0de0f11d7edda105

Cleans up bad state when transient taskbar shows on home.

Bug: 279514548
Test: open transparent activity on top of launcher
      unstash taskbar
      go home
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3bad3ebaad529a8be587b9c0eae61faf87ea8505)
Merged-In: I13ab79b334e1f8feda441a82cc4d035c0142f513
Change-Id: I13ab79b334e1f8feda441a82cc4d035c0142f513

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index 17e7e1b..ddea51f 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(