diff options
| author | Michael Kolb <kolby@google.com> | 2012-12-04 15:14:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-04 15:14:52 -0800 |
| commit | b3e4cc1a4c4bf27ba605cfa2175411e9bfc4603d (patch) | |
| tree | adf7a3bb5593d33af88e2dfa836c2723e4e877ab | |
| parent | 8ad54ea6105ca40b2f21301229469f1aa168206a (diff) | |
| parent | 3e9860b5e0e9cb93b4af3ff59aa94ea7fb83201b (diff) | |
| download | android_packages_apps_Snap-b3e4cc1a4c4bf27ba605cfa2175411e9bfc4603d.tar.gz android_packages_apps_Snap-b3e4cc1a4c4bf27ba605cfa2175411e9bfc4603d.tar.bz2 android_packages_apps_Snap-b3e4cc1a4c4bf27ba605cfa2175411e9bfc4603d.zip | |
am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a':
Prevent Camera UI in Gallery
| -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 be6706a14..58389e4ae 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -206,6 +206,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 @@ -1412,8 +1413,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); } |