commit 2acdc942a154a613caa004476b0142d4b98253f4
author Holly Jiuyu Sun <jiuyu@google.com> Tue Sep 12 03:53:12 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 12 03:53:12 2023 +0000
tree 66a6ee4e16667d1459ddb3edbb8151010547ea69
parent a1e8f327ff4c98c880e623944f3eea04c450d7d6
parent 997bc3e3626d640aee0ad9148074dc570a75e1f6

Merge "Set focus to EditText after open Toast with Meta key." into udc-qpr-dev am: 997bc3e362

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24667858

Change-Id: I06067fd7390e592ad3ea2f3988c920a2146c8d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ffb8b82..038967c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -144,6 +144,7 @@
 import com.android.launcher3.allapps.AllAppsTransitionController;
 import com.android.launcher3.allapps.BaseSearchConfig;
 import com.android.launcher3.allapps.DiscoveryBounce;
+import com.android.launcher3.anim.AnimationSuccessListener;
 import com.android.launcher3.anim.PropertyListBuilder;
 import com.android.launcher3.apppairs.AppPairIcon;
 import com.android.launcher3.celllayout.CellPosMapper;
@@ -1719,7 +1720,16 @@
         if (getStateManager().isInStableState(ALL_APPS)) {
             getStateManager().goToState(NORMAL, alreadyOnHome);
         } else {
-            showAllAppsFromIntent(alreadyOnHome);
+            AbstractFloatingView.closeAllOpenViews(this);
+            getStateManager().goToState(ALL_APPS, true /* animated */,
+                    new AnimationSuccessListener() {
+                        @Override
+                        public void onAnimationSuccess(Animator animator) {
+                            if (mAppsView.getSearchUiManager().getEditText() != null) {
+                                mAppsView.getSearchUiManager().getEditText().requestFocus();
+                            }
+                        }
+                    });
         }
     }