diff options
author | John Hoford <hoford@google.com> | 2013-09-16 15:51:02 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-09-16 15:51:37 -0700 |
commit | 463b918edda204f1563dc2e27976cafa6af9a769 (patch) | |
tree | 5c6bc9c9aacd0e22d1a7447c3671146f743d7ed5 /src | |
parent | 5921b53e411a1ee5de8daea34fda90c2ada31974 (diff) | |
download | android_packages_apps_Gallery2-463b918edda204f1563dc2e27976cafa6af9a769.tar.gz android_packages_apps_Gallery2-463b918edda204f1563dc2e27976cafa6af9a769.tar.bz2 android_packages_apps_Gallery2-463b918edda204f1563dc2e27976cafa6af9a769.zip |
Prevent edit during view photo intent
bug:9862016
Change-Id: I58e64765630f686f49836dbfb7a7447910e714ef
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 1 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index baef56b44..510542a23 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -206,6 +206,7 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi Path albumPath = dm.getDefaultSetOf(itemPath); data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, itemPath.toString()); + data.putBoolean(PhotoPage.KEY_READONLY, true); // TODO: Make the parameter "SingleItemOnly" public so other // activities can reference it. diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index e52e04491..c4a9d1b96 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -112,6 +112,7 @@ public abstract class PhotoPage extends ActivityState implements public static final String KEY_RETURN_INDEX_HINT = "return-index-hint"; public static final String KEY_SHOW_WHEN_LOCKED = "show_when_locked"; public static final String KEY_IN_CAMERA_ROLL = "in_camera_roll"; + public static final String KEY_READONLY = "read-only"; public static final String KEY_ALBUMPAGE_TRANSITION = "albumpage-transition"; public static final int MSG_ALBUMPAGE_NONE = 0; @@ -151,6 +152,7 @@ public abstract class PhotoPage extends ActivityState implements private boolean mShowSpinner; private String mSetPathString; // This is the original mSetPathString before adding the camera preview item. + private boolean mReadOnlyView = false; private String mOriginalSetPathString; private AppBridge mAppBridge; private SnailItem mScreenNailItem; @@ -379,6 +381,7 @@ public abstract class PhotoPage extends ActivityState implements }; mSetPathString = data.getString(KEY_MEDIA_SET_PATH); + mReadOnlyView = data.getBoolean(KEY_READONLY); mOriginalSetPathString = mSetPathString; setupNfcBeamPush(); String itemPathString = data.getString(KEY_MEDIA_ITEM_PATH); @@ -582,7 +585,7 @@ public abstract class PhotoPage extends ActivityState implements } switch(control) { case R.id.photopage_bottom_control_edit: - return mHaveImageEditor && mShowBars + return mHaveImageEditor && mShowBars && !mReadOnlyView && !mPhotoView.getFilmMode() && (mCurrentPhoto.getSupportedOperations() & MediaItem.SUPPORT_EDIT) != 0 && mCurrentPhoto.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE; @@ -769,6 +772,9 @@ public abstract class PhotoPage extends ActivityState implements if (mCurrentPhoto == null) return; int supportedOperations = mCurrentPhoto.getSupportedOperations(); + if (mReadOnlyView) { + supportedOperations ^= MediaObject.SUPPORT_EDIT; + } if (mSecureAlbum != null) { supportedOperations &= MediaObject.SUPPORT_DELETE; } else { |