diff options
| author | Senpo Hu <senpo@google.com> | 2014-08-29 16:27:03 -0700 |
|---|---|---|
| committer | Senpo Hu <senpo@google.com> | 2014-09-02 11:51:15 -0700 |
| commit | 9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95 (patch) | |
| tree | 07c7d0e25b95f7e7c570fbe68481365d8d86154b /src/com/android/camera/CameraActivity.java | |
| parent | 965db3e8ca1416e418990344486b1008d1ebc8dd (diff) | |
| download | android_packages_apps_Camera2-9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95.tar.gz android_packages_apps_Camera2-9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95.tar.bz2 android_packages_apps_Camera2-9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95.zip | |
Starting share/edit/play activities in its own task.
Bug: 17091348
Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 43cddd20d..55f1d4047 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -175,14 +175,6 @@ public class CameraActivity extends Activity public static final String MODULE_SCOPE_PREFIX = "_preferences_module_"; public static final String CAMERA_SCOPE_PREFIX = "_preferences_camera_"; - /** - * Request code from an activity we started that indicated that we do not - * want to reset the view to the preview in onResume. - */ - public static final int REQ_CODE_DONT_SWITCH_TO_PREVIEW = 142; - - public static final int REQ_CODE_GCAM_DEBUG_POSTCAPTURE = 999; - private static final int MSG_CLEAR_SCREEN_ON_FLAG = 2; private static final long SCREEN_DELAY_MS = 2 * 60 * 1000; // 2 mins. private static final int MAX_PEEK_BITMAP_PIXELS = 1600000; // 1.6 * 4 MBs. @@ -976,7 +968,11 @@ public class CameraActivity extends Activity @Override public void launchActivityByIntent(Intent intent) { - startActivityForResult(intent, REQ_CODE_DONT_SWITCH_TO_PREVIEW); + // Starting from L, we prefer not to start edit activity within camera's task. + mResetToPreviewOnResume = false; + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + + startActivity(intent); } @Override @@ -1640,15 +1636,6 @@ public class CameraActivity extends Activity } @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQ_CODE_DONT_SWITCH_TO_PREVIEW) { - mResetToPreviewOnResume = false; - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } - - @Override public void onResume() { CameraPerformanceTracker.onEvent(CameraPerformanceTracker.ACTIVITY_RESUME); Log.v(TAG, "Build info: " + Build.DISPLAY); |