diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-14 06:25:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-14 06:25:19 -0700 |
| commit | be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb (patch) | |
| tree | 5c480709839fac2da63bb0074ba8fc236c8794de /src | |
| parent | 1588d7f5686d54fb67745c029781e7629ef148c1 (diff) | |
| parent | b6d1df6f74493f4ca7586fe1f755c38488e025f2 (diff) | |
| download | android_packages_apps_Gallery2-be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb.tar.gz android_packages_apps_Gallery2-be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb.tar.bz2 android_packages_apps_Gallery2-be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb.zip | |
Merge "Gallery2 : Delete and Details options are not visible on Camera preview"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/UriImage.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 67e8071d3..1b0384548 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -266,8 +266,8 @@ public class LocalImage extends LocalMediaItem { operation |= SUPPORT_SHARE; } } else { - operation = SUPPORT_SHARE | SUPPORT_CROP | SUPPORT_PRINT | SUPPORT_SETAS; - + operation = SUPPORT_DELETE | SUPPORT_SHARE | SUPPORT_CROP + | SUPPORT_SETAS | SUPPORT_PRINT | SUPPORT_INFO; if (BitmapUtils.isSupportedByRegionDecoder(mimeType)) { operation |= SUPPORT_FULL_IMAGE | SUPPORT_EDIT; } diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index 0cc1140c6..13176e4aa 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java @@ -233,8 +233,8 @@ public class UriImage extends MediaItem { supported |= SUPPORT_SHARE; } } else { - if (isSharable()) - supported |= SUPPORT_SHARE | SUPPORT_PRINT | SUPPORT_SETAS; + supported = SUPPORT_PRINT | SUPPORT_SETAS; + if (isSharable()) supported |= SUPPORT_SHARE; if (BitmapUtils.isSupportedByRegionDecoder(mContentType)) { supported |= SUPPORT_EDIT | SUPPORT_FULL_IMAGE; } |