summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-06-04 21:13:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-04 21:13:06 +0000
commit4c6debb7678794401e9732cad4475e28ab91a496 (patch)
treec728fad86c44b10b65b39472e7a55e3a4ac2443a /core/java/com
parentf5188cf6d5e474cef3d1ac9bd4e2be4965866d5f (diff)
parent2c60de3f6d849a581cca89ece7149c3836b3b6e4 (diff)
downloadframeworks_base-4c6debb7678794401e9732cad4475e28ab91a496.zip
frameworks_base-4c6debb7678794401e9732cad4475e28ab91a496.tar.gz
frameworks_base-4c6debb7678794401e9732cad4475e28ab91a496.tar.bz2
Merge "Launch document sharing into unique activities" into lmp-preview-dev
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;