diff options
| author | Michael Kolb <kolby@google.com> | 2012-12-04 15:12:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-04 15:12:46 -0800 |
| commit | 7a5377322dcebdaad98df9a31cadc7ff0f464d8a (patch) | |
| tree | 1524107755efc3c62a13f112a30ca5e30ea69c02 | |
| parent | c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644 (diff) | |
| parent | 6bf226e45ec542eae4f766a2417bfdda625af4f0 (diff) | |
| download | android_packages_apps_Gallery2-7a5377322dcebdaad98df9a31cadc7ff0f464d8a.tar.gz android_packages_apps_Gallery2-7a5377322dcebdaad98df9a31cadc7ff0f464d8a.tar.bz2 android_packages_apps_Gallery2-7a5377322dcebdaad98df9a31cadc7ff0f464d8a.zip | |
Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 4 |
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); } |