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

Commit 7f899d25 authored by Sascha Haeberling's avatar Sascha Haeberling Committed by Android Git Automerger
Browse files

am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the... 

am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce

* commit 'd313bb0a':
  Make sure we don't add the pano sharing menu in the secure lock screen.
parents 123dc81c d313bb0a

src/com/android/gallery3d/app/PhotoPage.java

+5 −3
Original line number Diff line number Diff line
@@ -815,11 +815,13 @@ public abstract class PhotoPage extends ActivityState implements 
        int supportedOperations = mCurrentPhoto.getSupportedOperations();

        if (mSecureAlbum != null) {

            supportedOperations &= MediaObject.SUPPORT_DELETE;

        } else if (!mHaveImageEditor) {

        } else {

            mCurrentPhoto.getPanoramaSupport(mUpdatePanoramaMenuItemsCallback);

            if (!mHaveImageEditor) {

                supportedOperations &= ~MediaObject.SUPPORT_EDIT;

            }

        }

        MenuExecutor.updateMenuOperation(menu, supportedOperations);

        mCurrentPhoto.getPanoramaSupport(mUpdatePanoramaMenuItemsCallback);

    }



    private boolean canDoSlideShow() {