commit a66bbdab86307b00dfa98e12799e2770d1028c9b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 15 23:20:08 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 15 23:20:08 2022 +0000
tree ff59733aa62f06a1e36de3eaec615f65a67d8592
parent 8dff7ca8305d23d62b964f87a2520769d1242465
parent 0cde81a5d2b9c603df29bdf6eb3bbce2c11997bf

Merge "Fix failing test TaplTaskbarTest#testHideShowTaskbar" into tm-dev

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java
index 4597422..32ebbe8 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsViewController.java
@@ -20,6 +20,7 @@
 import static com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView.DEFAULT_OPEN_DURATION;
 import static com.android.launcher3.util.OnboardingPrefs.ALL_APPS_VISITED_COUNT;
 
+import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.appprediction.AppsDividerView;
 import com.android.launcher3.appprediction.PredictionRowView;
 import com.android.launcher3.taskbar.TaskbarStashController;
@@ -83,6 +84,8 @@
         mTaskbarStashController.updateStateForFlag(FLAG_STASHED_IN_APP_ALL_APPS, true);
         mTaskbarStashController.applyState(DEFAULT_OPEN_DURATION);
         mSlideInView.setOnCloseBeginListener(() -> {
+            AbstractFloatingView.closeOpenContainer(
+                    mContext, AbstractFloatingView.TYPE_ACTION_POPUP);
             mTaskbarStashController.updateStateForFlag(
                     FLAG_STASHED_IN_APP_ALL_APPS, false);
             mTaskbarStashController.applyState(DEFAULT_CLOSE_DURATION);