Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2acdc942 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I06067fd7390e592ad3ea2f3988c920a2146c8d4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1e8f327 997bc3e3

src/com/android/launcher3/Launcher.java

+11 −1
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ import com.android.launcher3.allapps.AllAppsStore; 
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 @@ public class Launcher extends StatefulActivity<LauncherState> 
        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();

                            }

                        }

                    });

        }

    }