PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 23:08:53 +00:00
committed by Android (Google) Code Review
parent 4ff2f7697c 5ee7c13c60
commit d30f4ce528
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+2 -5
View File
@@ -905,7 +905,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
} else { } else {
mOverlayManager.onActivityStopped(this); mOverlayManager.onActivityStopped(this);
} }
hideKeyboard();
logStopAndResume(false /* isResume */); logStopAndResume(false /* isResume */);
mAppWidgetHost.setActivityStarted(false); mAppWidgetHost.setActivityStarted(false);
NotificationListener.removeNotificationsChangedListener(); NotificationListener.removeNotificationsChangedListener();
@@ -1459,7 +1459,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
&& AbstractFloatingView.getTopOpenView(this) == null; && AbstractFloatingView.getTopOpenView(this) == null;
boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction()); boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent); boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent);
hideKeyboard();
if (isActionMain) { if (isActionMain) {
if (!internalStateHandled) { if (!internalStateHandled) {
// In all these cases, only animate if we're already on home // 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) { if (mLauncherCallbacks != null) {
mLauncherCallbacks.onHomeIntent(internalStateHandled); mLauncherCallbacks.onHomeIntent(internalStateHandled);
} }