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

This commit is contained in:
TreeHugger Robot
2021-05-11 23:08:53 +00:00
committed by Android (Google) Code Review

View File

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