summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-02-24 16:46:04 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-24 17:31:05 -0800
commitd699b6a5fc00b316eea93a278faf1802335ecf95 (patch)
tree36455c9482e1c10739b7cd710ddffca81e7c3a62
parent1c26c3241c19bdf7254b2473fd3935349ea8d08e (diff)
downloadandroid_packages_apps_Gallery2-d699b6a5fc00b316eea93a278faf1802335ecf95.zip
android_packages_apps_Gallery2-d699b6a5fc00b316eea93a278faf1802335ecf95.tar.gz
android_packages_apps_Gallery2-d699b6a5fc00b316eea93a278faf1802335ecf95.tar.bz2
Gallery2: Allow edit if launched from Snapcam
Change-Id: I3d1b8f5ed9cb52012a9be5037eef8a6c5323a151
-rw-r--r--src/com/android/gallery3d/app/GalleryActivity.java5
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 d8ce786..d918e14 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.