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

Commit d30f4ce5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "hide keyboard onStop and onNewIntent" into sc-dev

parents 4ff2f769 5ee7c13c

src/com/android/launcher3/Launcher.java

+2 −5
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
        } else {

            mOverlayManager.onActivityStopped(this);

        }



        hideKeyboard();

        logStopAndResume(false /* isResume */);

        mAppWidgetHost.setActivityStarted(false);

        NotificationListener.removeNotificationsChangedListener();
@@ -1459,7 +1459,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
                && AbstractFloatingView.getTopOpenView(this) == null;

        boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());

        boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent);



        hideKeyboard();

        if (isActionMain) {

            if (!internalStateHandled) {

                // In all these cases, only animate if we're already on home
@@ -1481,9 +1481,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
                }

            }



            // Handle HOME_INTENT

            hideKeyboard();



            if (mLauncherCallbacks != null) {

                mLauncherCallbacks.onHomeIntent(internalStateHandled);

            }