summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-06-04 22:03:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-04 22:03:12 +0000
commita0c808bb755228f288ca035166ee681a5e9fdc2f (patch)
treeb06029d539f1f222798ab3da22c00d2387bb8813 /core/java/com
parent3407c254991073840c9171dcf83388d7f8d1cc39 (diff)
parent4c6debb7678794401e9732cad4475e28ab91a496 (diff)
downloadframeworks_base-a0c808bb755228f288ca035166ee681a5e9fdc2f.zip
frameworks_base-a0c808bb755228f288ca035166ee681a5e9fdc2f.tar.gz
frameworks_base-a0c808bb755228f288ca035166ee681a5e9fdc2f.tar.bz2
am d842513c: Merge "Launch document sharing into unique activities" into lmp-preview-dev
* commit 'd842513c3df5fd3e46a70ab6798b4d3d20c4ef0b': Launch document sharing into unique activities
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 106ac0b..877938e 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -38,6 +38,7 @@ public class ChooserActivity extends ResolverActivity {
if (Intent.ACTION_SEND.equals(action) ||
Intent.ACTION_SEND_MULTIPLE.equals(action)) {
target.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |
+ Intent.FLAG_ACTIVITY_MULTIPLE_TASK |
Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);
}
}
@@ -61,6 +62,7 @@ public class ChooserActivity extends ResolverActivity {
if (Intent.ACTION_SEND.equals(action) ||
Intent.ACTION_SEND_MULTIPLE.equals(action)) {
in.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |
+ Intent.FLAG_ACTIVITY_MULTIPLE_TASK |
Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS);
}
initialIntents[i] = in;