diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-10-10 15:19:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 15:19:04 -0700 |
| commit | 9d5c9d1c6642ad2e583737fe4d1f66e3a0489027 (patch) | |
| tree | 7084a8bbaa496a86b98a9fa5a63e49d3ef4e151e /src/com | |
| parent | aef384c77c316afd4e99946a3cf38c25e200544b (diff) | |
| parent | b34ee65fcc58f2729acd63f4a9e051a467565f4b (diff) | |
| download | android_packages_apps_Snap-9d5c9d1c6642ad2e583737fe4d1f66e3a0489027.tar.gz android_packages_apps_Snap-9d5c9d1c6642ad2e583737fe4d1f66e3a0489027.tar.bz2 android_packages_apps_Snap-9d5c9d1c6642ad2e583737fe4d1f66e3a0489027.zip | |
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/UriImage.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 7006b0a82..5d6d39dcf 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -259,8 +259,8 @@ public class LocalImage extends LocalMediaItem { operation |= SUPPORT_PANORAMA; if (isPanorama360()) { operation |= SUPPORT_PANORAMA360; - // disable destructive rotate for 360 degree panorama - operation &= ~SUPPORT_ROTATE; + // disable destructive rotate and crop for 360 degree panorama + operation &= ~(SUPPORT_ROTATE | SUPPORT_CROP); } } return operation; diff --git a/src/com/android/gallery3d/data/UriImage.java b/src/com/android/gallery3d/data/UriImage.java index a72ced2b8..b2cbc7d68 100644 --- a/src/com/android/gallery3d/data/UriImage.java +++ b/src/com/android/gallery3d/data/UriImage.java @@ -224,6 +224,8 @@ public class UriImage extends MediaItem { supported |= SUPPORT_PANORAMA; if (isPanorama360()) { supported |= SUPPORT_PANORAMA360; + // disable destructive crop for 360 degree panorama + supported &= ~SUPPORT_CROP; } } return supported; |