diff options
author | Joe Onorato <joeo@android.com> | 2009-10-07 10:26:17 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-10-07 10:26:17 -0700 |
commit | 742966ba0eb3106202b57709f3cc9c2ecfb2a41d (patch) | |
tree | a3a8485a4e46d4326a7cc5278357ed86bafccfbf /src | |
parent | a8138d5fa184681cbfeb0f489c84d11c21a8a0a3 (diff) | |
download | android_packages_apps_Trebuchet-742966ba0eb3106202b57709f3cc9c2ecfb2a41d.tar.gz android_packages_apps_Trebuchet-742966ba0eb3106202b57709f3cc9c2ecfb2a41d.tar.bz2 android_packages_apps_Trebuchet-742966ba0eb3106202b57709f3cc9c2ecfb2a41d.zip |
Launcher2 - Fix 2171232 Homescreen stopped responding after pressing home in wallpaper selector.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index b8ad189a6..4fe655eb2 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -774,6 +774,9 @@ public final class Launcher extends Activity if (Intent.ACTION_MAIN.equals(intent.getAction())) { getWindow().closeAllPanels(); + // Whatever we were doing is hereby canceled. + mWaitingForResult = false; + // Set this flag so that onResume knows to close the search dialog if it's open, // because this was a new intent (thus a press of 'home' or some such) rather than // for example onResume being called when the user pressed the 'back' button. |