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

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 0758656a1..6dcae4ca4 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -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);
         }