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

Commit 6bf226e4 authored by Michael Kolb's avatar Michael Kolb
Browse files

Prevent Camera UI in Gallery 

  Bug: 7668856

At startup, the PhotoView wouldn't execute the onFullScreenChanged
callback, so the Camera UI believed it was in Camera.

Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
parent 04df59eb

src/com/android/gallery3d/ui/PhotoView.java

+3 −1
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public class PhotoView extends GLView { 
    private boolean mFullScreenCamera;

    private Rect mCameraRelativeFrame = new Rect();

    private Rect mCameraRect = new Rect();

    private boolean mFirst = true;



    // [mPrevBound, mNextBound] is the range of index for all pictures in the

    // model, if we assume the index of current focused picture is 0.  So if
@@ -1406,8 +1407,9 @@ public class PhotoView extends GLView { 
        boolean full = !mFilmMode && mPictures.get(0).isCamera()

                && mPositionController.isCenter()

                && mPositionController.isAtMinimalScale();

        if (full != mFullScreenCamera) {

        if (mFirst || full != mFullScreenCamera) {

            mFullScreenCamera = full;

            mFirst = false;

            mListener.onFullScreenChanged(full);

            if (full) mHandler.sendEmptyMessage(MSG_UNDO_BAR_FULL_CAMERA);

        }