commit 0cde81a5d2b9c603df29bdf6eb3bbce2c11997bf
author Schneider Victor-tulias <victortulias@google.com> Mon Mar 14 14:44:47 2022 -0700
committer Schneider Victor-tulias <victortulias@google.com> Mon Mar 14 22:19:12 2022 +0000
tree dfe1360e4cdeeafe835d1ed12a0334cb6ca1bc48
parent 763fd21b344dbaa73d9151106df1c80354677825

Fix failing test TaplTaskbarTest#testHideShowTaskbar

Closing the Taskbar all apps page doesn't automatically close any open popup menus. This lead to the popup menu opened in TaplTaskbarTests#testOpenMenu_FromTaskbarAllApps remaining open after going home in setUp (before running TaplTaskbarTest#testHideShowTaskbar). The the workspace is not visible to the tests while the popup menu is open, so this test would consistenly fail.

Bug: 215218813
Fixes: 224597087
Test: Ran tests locally and remotely
Change-Id: I81d8eb1e99a264611749eb3c508f707988c0fcb1

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);