Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java
index 7006b0a..5d6d39d 100644
--- a/src/com/android/gallery3d/data/LocalImage.java
+++ b/src/com/android/gallery3d/data/LocalImage.java
@@ -259,8 +259,8 @@
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 a72ced2..b2cbc7d 100644
--- a/src/com/android/gallery3d/data/UriImage.java
+++ b/src/com/android/gallery3d/data/UriImage.java
@@ -224,6 +224,8 @@
supported |= SUPPORT_PANORAMA;
if (isPanorama360()) {
supported |= SUPPORT_PANORAMA360;
+ // disable destructive crop for 360 degree panorama
+ supported &= ~SUPPORT_CROP;
}
}
return supported;