diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-25 20:07:01 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-25 20:07:01 -0800 |
commit | 277c60e164e3b5a307543a5b5da8558191731cde (patch) | |
tree | bec04a20edb9c630102cb98fecbbfbbf22d49445 /src/com/android | |
parent | e5583a329828f686734844de89b16c08b588a6f5 (diff) | |
parent | be27da03400cfa27cee5b418102dcb2721c202c5 (diff) | |
download | android_packages_apps_Snap-277c60e164e3b5a307543a5b5da8558191731cde.tar.gz android_packages_apps_Snap-277c60e164e3b5a307543a5b5da8558191731cde.tar.bz2 android_packages_apps_Snap-277c60e164e3b5a307543a5b5da8558191731cde.zip |
Merge "SnapdragonCamera: Allow edit in Gallery2 if launched from Snapcam"
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index cdaedbb8a..8968377e9 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -134,6 +134,9 @@ public class CameraActivity extends Activity "com.android.camera.action.TRIM"; public static final String MEDIA_ITEM_PATH = "media-item-path"; + // Used to show whether Gallery was launched from Snapcam + private static final String KEY_FROM_SNAPCAM = "from-snapcam"; + // The intent extra for camera from secure lock screen. True if the gallery // should only show newly captured pictures. sSecureAlbumId does not // increment. This is used when switching between camera, camcorder, and @@ -567,12 +570,14 @@ public class CameraActivity extends Activity Intent intent = IntentHelper.getGalleryIntent(this); intent.setAction(Intent.ACTION_VIEW); intent.setData(uri); + intent.putExtra(KEY_FROM_SNAPCAM, true); startActivity(intent); } catch (ActivityNotFoundException ex) { try { Log.w(TAG, "Gallery not found"); Intent intent = new Intent(Intent.ACTION_VIEW, uri); startActivity(intent); + intent.putExtra(KEY_FROM_SNAPCAM, true); } catch (ActivityNotFoundException e) { Log.w(TAG, "No Activity could be found to open image or video"); } |