diff options
| author | Alan Newberger <alann@google.com> | 2014-10-01 17:18:35 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2014-10-02 00:26:06 +0000 |
| commit | e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd (patch) | |
| tree | 0edb9eeca466065b9a60070efb01eee02dd1cf77 | |
| parent | dae542a3c94b1663c72cb4be29d5edf1a7aa4f30 (diff) | |
| download | android_packages_apps_Camera2-e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd.tar.gz android_packages_apps_Camera2-e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd.tar.bz2 android_packages_apps_Camera2-e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd.zip | |
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
To ensure items are placed in separate affinity in document mode.
Bug: 17758840
Change-Id: I7ea1c9c841f3e60271307ed67e760be494835855
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 571a692a4..25735ed81 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -980,7 +980,7 @@ public class CameraActivity extends Activity public void launchActivityByIntent(Intent intent) { // Starting from L, we prefer not to start edit activity within camera's task. mResetToPreviewOnResume = false; - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); startActivity(intent); } diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 3a7e355c2..a55aa8451 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -1102,7 +1102,7 @@ public class CameraUtil { MAPS_CLASS_NAME); Intent mapsIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri)).setComponent(compName); - mapsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mapsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); activity.startActivity(mapsIntent); } catch (ActivityNotFoundException e) { // Use the "geo intent" if no GMM is installed |