diff options
| author | Kenny Guy <kennyguy@google.com> | 2014-05-13 16:28:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-13 16:28:40 +0000 |
| commit | c2a2c6238d7bc337f047880166181794b2b9e520 (patch) | |
| tree | 6aa8143a0363114af66960f7a678fbb6133562a9 /src/com/android/launcher3 | |
| parent | 56924a822d3e96a4ef9038f1f34750c216c6e438 (diff) | |
| parent | b6cc40bc15ef97ba7d677295c9a3870f18eadbe2 (diff) | |
| download | android_packages_apps_Trebuchet-c2a2c6238d7bc337f047880166181794b2b9e520.tar.gz android_packages_apps_Trebuchet-c2a2c6238d7bc337f047880166181794b2b9e520.tar.bz2 android_packages_apps_Trebuchet-c2a2c6238d7bc337f047880166181794b2b9e520.zip | |
Merge "Don't clear flags in startActivity" into ub-now-nova
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/AppInfo.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppInfo.java b/src/com/android/launcher3/AppInfo.java index 40e8e6d0e..c85626b10 100644 --- a/src/com/android/launcher3/AppInfo.java +++ b/src/com/android/launcher3/AppInfo.java @@ -87,6 +87,7 @@ public class AppInfo extends ItemInfo { intent = new Intent(Intent.ACTION_MAIN); intent.addCategory(Intent.CATEGORY_LAUNCHER); intent.setComponent(info.getComponentName()); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); long serialNumber = UserManagerCompat.getInstance(context).getSerialNumberForUser(user); intent.putExtra(EXTRA_PROFILE, serialNumber); this.user = user; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b97ced702..3636107c2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2629,7 +2629,7 @@ public class Launcher extends Activity } boolean startActivity(View v, Intent intent, Object tag) { - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); try { // Only launch using the new animation if the shortcut has not opted out (this is a // private contract between launcher and may be ignored in the future). |