diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-10-10 15:20:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 15:20:39 -0700 |
| commit | 4a44ff7cf3965bbf61875e4b894d782f1279d7d3 (patch) | |
| tree | 0e8e856822a80ee1364c195905f6113b940e9062 | |
| parent | 9c394897104d53335e912f50b7d805655c86a0c6 (diff) | |
| parent | 9d5c9d1c6642ad2e583737fe4d1f66e3a0489027 (diff) | |
| download | android_packages_apps_Snap-4a44ff7cf3965bbf61875e4b894d782f1279d7d3.tar.gz android_packages_apps_Snap-4a44ff7cf3965bbf61875e4b894d782f1279d7d3.tar.bz2 android_packages_apps_Snap-4a44ff7cf3965bbf61875e4b894d782f1279d7d3.zip | |
am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
* commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f':
Disable in-place crop for 360 panorama
| -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; |