diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-25 13:54:49 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-25 13:54:49 -0800 |
| commit | ce7d8bd2dd6f864908b9b0d1d2459de4ebe910b6 (patch) | |
| tree | 36455c9482e1c10739b7cd710ddffca81e7c3a62 /src | |
| parent | 1c26c3241c19bdf7254b2473fd3935349ea8d08e (diff) | |
| parent | d699b6a5fc00b316eea93a278faf1802335ecf95 (diff) | |
| download | android_packages_apps_Gallery2-ce7d8bd2dd6f864908b9b0d1d2459de4ebe910b6.tar.gz android_packages_apps_Gallery2-ce7d8bd2dd6f864908b9b0d1d2459de4ebe910b6.tar.bz2 android_packages_apps_Gallery2-ce7d8bd2dd6f864908b9b0d1d2459de4ebe910b6.zip | |
Merge "Gallery2: Allow edit if launched from Snapcam"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/GalleryActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java index d8ce7867b..d918e1457 100644 --- a/src/com/android/gallery3d/app/GalleryActivity.java +++ b/src/com/android/gallery3d/app/GalleryActivity.java @@ -60,6 +60,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On public static final String KEY_TYPE_BITS = "type-bits"; public static final String KEY_MEDIA_TYPES = "mediaTypes"; public static final String KEY_DISMISS_KEYGUARD = "dismiss-keyguard"; + public static final String KEY_FROM_SNAPCAM = "from-snapcam"; private static final String TAG = "GalleryActivity"; private Dialog mVersionCheckDialog; @@ -286,7 +287,9 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On Path albumPath = dm.getDefaultSetOf(itemPath); data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, itemPath.toString()); - data.putBoolean(PhotoPage.KEY_READONLY, true); + if (!intent.getBooleanExtra(KEY_FROM_SNAPCAM, false)) { + data.putBoolean(PhotoPage.KEY_READONLY, true); + } // TODO: Make the parameter "SingleItemOnly" public so other // activities can reference it. |