diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-10-10 14:58:35 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2012-10-10 14:58:35 -0700 |
| commit | b34ee65fcc58f2729acd63f4a9e051a467565f4b (patch) | |
| tree | b55412910a8da04583a64a7bd7a6fab711b2911e /src | |
| parent | 4de9c3e83ad2c5ea8b5277c7a002520d2bbcd608 (diff) | |
| download | android_packages_apps_Snap-b34ee65fcc58f2729acd63f4a9e051a467565f4b.tar.gz android_packages_apps_Snap-b34ee65fcc58f2729acd63f4a9e051a467565f4b.tar.bz2 android_packages_apps_Snap-b34ee65fcc58f2729acd63f4a9e051a467565f4b.zip | |
Disable in-place crop for 360 panorama
Bug: 7281479
Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
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 | 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; |