diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-02-24 16:48:43 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-24 17:32:41 -0800 |
commit | be27da03400cfa27cee5b418102dcb2721c202c5 (patch) | |
tree | 286bc51a10e1c7b5f54a5e9ec90093528e3877c5 | |
parent | 00357c3542c1c8db05b14c46f41b276a8aff5006 (diff) | |
download | android_packages_apps_Snap-be27da03400cfa27cee5b418102dcb2721c202c5.tar.gz android_packages_apps_Snap-be27da03400cfa27cee5b418102dcb2721c202c5.tar.bz2 android_packages_apps_Snap-be27da03400cfa27cee5b418102dcb2721c202c5.zip |
SnapdragonCamera: Allow edit in Gallery2 if launched from Snapcam
Change-Id: I67afa657adfc137a70f0c5d8d831bc2b0cbdaaeb
-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"); } |