commit 2c3c1e46c0b60db7e83eaa7481238b6fcc84a063
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 30 17:45:50 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 30 17:45:50 2023 +0000
tree 64c51ba545172438d1abe1a0a2ca26d02dfbf1ff
parent 665524cc370d1e770771f0d015ea3d7d7dfc5a7b
parent 3bad3ebaad529a8be587b9c0eae61faf87ea8505

Merge "Cleans up bad state when transient taskbar shows on home." into udc-dev

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(