diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2013-09-19 23:42:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-19 23:42:03 +0000 |
| commit | 6904a72d84d6662c00be83186468600f84448590 (patch) | |
| tree | 45f520dd2cf882d874aae21603a52574112954b5 /src | |
| parent | 962cf04c60249c2d116f9ee07e747180bee46014 (diff) | |
| parent | 94e122bf3dbcd316922cbd145adec30b49f2f8ae (diff) | |
| download | android_packages_apps_Gallery2-6904a72d84d6662c00be83186468600f84448590.tar.gz android_packages_apps_Gallery2-6904a72d84d6662c00be83186468600f84448590.tar.bz2 android_packages_apps_Gallery2-6904a72d84d6662c00be83186468600f84448590.zip | |
Merge "Use the same taskAffinity for trampoline as Camera" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index c8dadbd18..f2402af7d 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -27,7 +27,10 @@ public class CameraActivity extends Activity { public void onCreate(Bundle icicle) { super.onCreate(icicle); Intent intent = CameraHelper.CAMERA_LAUNCHER_INTENT; - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); + // Since this is being launched from a homescreen shorcut, + // it's already in a new task. Start Camera activity and + // reset the task to its initial state if needed. + intent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); startActivity(intent); finish(); } |