Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b900e0d authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android (Google) Code Review
Browse files

Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches

parents db3b0d4c 682163e1

src/com/android/gallery3d/data/LocalImage.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/gallery3d/data/UriImage.java

+2 −0
Original line number Diff line number Diff line
@@ -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;