From b34ee65fcc58f2729acd63f4a9e051a467565f4b Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Wed, 10 Oct 2012 14:58:35 -0700 Subject: Disable in-place crop for 360 panorama Bug: 7281479 Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f --- src/com/android/gallery3d/data/LocalImage.java | 4 ++-- 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; -- cgit v1.2.3