commit b3cd9802e87eefcba754d42128d47ace3c6b7307
author Himanshu Gupta <himanshuz@google.com> Sun Feb 25 14:49:06 2024 +0000
committer Himanshu Gupta <himanshuz@google.com> Sat Mar 02 18:42:33 2024 +0000
tree 3d5d67d153303ff9ae63198fc47e3ca703e9033c
parent b588e4618b9223345cf96a62139cd9f77a53ea28

Clearing All Apps Search For ALL_APPS Intent

Currently, if ALL_APPS intent is executed while All Apps
QSB is highlighted, user is left on the search sub-view of
the All Apps view.
To fix this, we add a runner to check the search view and
exit from it after State Transition has happened.

Before: https://photos.app.goo.gl/c5WeUnAzowxRWW1m7
After: https://photos.app.goo.gl/dxvb23wzwPfKqi3o6

Bug: 324516950
Flag: NA
Test: Manual flash and running intent via cmd
Change-Id: Icc291f792545b0c515535857f578bc2e01fef7f7

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c1ebbe5..e4914aa 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1629,7 +1629,8 @@
         } else if (INTENT_ACTION_ALL_APPS_TOGGLE.equals(intent.getAction())) {
             toggleAllAppsFromIntent(alreadyOnHome);
         } else if (Intent.ACTION_SHOW_WORK_APPS.equals(intent.getAction())) {
-            showAllAppsWorkTabFromIntent(alreadyOnHome);
+            showAllAppsWithSelectedTabFromIntent(alreadyOnHome,
+                    ActivityAllAppsContainerView.AdapterHolder.WORK);
         }
 
         TraceHelper.INSTANCE.endSection();
@@ -1661,13 +1662,19 @@
     }
 
     protected void showAllAppsFromIntent(boolean alreadyOnHome) {
-        AbstractFloatingView.closeAllOpenViews(this);
-        getStateManager().goToState(ALL_APPS, alreadyOnHome);
+        showAllAppsWithSelectedTabFromIntent(alreadyOnHome,
+                ActivityAllAppsContainerView.AdapterHolder.MAIN);
     }
 
-    private void showAllAppsWorkTabFromIntent(boolean alreadyOnHome) {
-        showAllAppsFromIntent(alreadyOnHome);
-        mAppsView.switchToTab(ActivityAllAppsContainerView.AdapterHolder.WORK);
+    private void showAllAppsWithSelectedTabFromIntent(boolean alreadyOnHome, int tab) {
+        AbstractFloatingView.closeAllOpenViews(this);
+        getStateManager().goToState(ALL_APPS, alreadyOnHome);
+        if (mAppsView.isSearching()) {
+            mAppsView.reset(alreadyOnHome);
+        }
+        if (mAppsView.getCurrentPage() != tab) {
+            mAppsView.switchToTab(tab);
+        }
     }
 
     /**