summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <>2009-03-24 21:00:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 21:00:33 -0700
commitbd2e54d8ae16a5abf8d0ff090b0388f1b45cd572 (patch)
treed1ed91bcdc886eeb1ae7d56218ed7001dd1da534
parentc5aa56da9a3e3247fcc54a2e585bbe30db2f55fb (diff)
downloadandroid_packages_apps_Trebuchet-bd2e54d8ae16a5abf8d0ff090b0388f1b45cd572.tar.gz
android_packages_apps_Trebuchet-bd2e54d8ae16a5abf8d0ff090b0388f1b45cd572.tar.bz2
android_packages_apps_Trebuchet-bd2e54d8ae16a5abf8d0ff090b0388f1b45cd572.zip
Automated import from //branches/donutburger/...@141844,141844
-rw-r--r--src/com/android/launcher/Launcher.java3
-rw-r--r--src/com/android/launcher/LauncherProvider.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index d84e67da7..d64669b2a 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -412,7 +412,8 @@ public final class Launcher extends Activity implements View.OnClickListener, On
intent.putExtra(Contacts.Intents.UI.FILTER_TEXT_EXTRA_KEY, str);
}
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
try {
startActivity(intent);
diff --git a/src/com/android/launcher/LauncherProvider.java b/src/com/android/launcher/LauncherProvider.java
index 21ef1e0f1..e63ef3084 100644
--- a/src/com/android/launcher/LauncherProvider.java
+++ b/src/com/android/launcher/LauncherProvider.java
@@ -505,7 +505,8 @@ public class LauncherProvider extends ContentProvider {
ComponentName cn = new ComponentName(packageName, className);
info = packageManager.getActivityInfo(cn, 0);
intent.setComponent(cn);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
values.put(Favorites.INTENT, intent.toURI());
values.put(Favorites.TITLE, info.loadLabel(packageManager).toString());
values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_APPLICATION);