summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2009-10-07 10:35:51 -0700
committerJoe Onorato <joeo@android.com>2009-10-07 10:35:51 -0700
commitff3862d415bbfd86b382012d6495240c0bc965c0 (patch)
tree3395a3c8bb2a426fba8f7542dbaf77d316a6faec
parent742966ba0eb3106202b57709f3cc9c2ecfb2a41d (diff)
downloadpackages_apps_trebuchet-ff3862d415bbfd86b382012d6495240c0bc965c0.zip
packages_apps_trebuchet-ff3862d415bbfd86b382012d6495240c0bc965c0.tar.gz
packages_apps_trebuchet-ff3862d415bbfd86b382012d6495240c0bc965c0.tar.bz2
Don't exit all apps when we launch apps.
-rw-r--r--src/com/android/launcher2/Launcher.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 4fe655e..93ce9d5 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -183,6 +183,7 @@ public final class Launcher extends Activity
private boolean mRestoring;
private boolean mWaitingForResult;
private boolean mLocaleChanged;
+ private boolean mExitingBecauseOfLaunch;
private boolean mHomeDown;
private boolean mBackDown;
@@ -416,7 +417,10 @@ public final class Launcher extends Activity
@Override
protected void onPause() {
super.onPause();
- closeAllApps(false);
+ if (mExitingBecauseOfLaunch) {
+ mExitingBecauseOfLaunch = false;
+ closeAllApps(false);
+ }
}
@Override
@@ -1330,6 +1334,7 @@ public final class Launcher extends Activity
// Open shortcut
final Intent intent = ((ApplicationInfo) tag).intent;
startActivitySafely(intent);
+ mExitingBecauseOfLaunch = true;
} else if (tag instanceof FolderInfo) {
handleFolderClick((FolderInfo) tag);
} else if (v == mHandleView) {