diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-09-11 11:18:36 -0700 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2012-09-11 11:18:36 -0700 |
commit | dc10b30ba0366126ed1ad5133b36e97d76335049 (patch) | |
tree | 2817fb8a614c5f1d0149abdd0537e81e645e7d55 /src | |
parent | e9494164bd7dd1c55c99b3ae1e842b88bf6abd78 (diff) | |
download | android_packages_apps_Gallery2-dc10b30ba0366126ed1ad5133b36e97d76335049.tar.gz android_packages_apps_Gallery2-dc10b30ba0366126ed1ad5133b36e97d76335049.tar.bz2 android_packages_apps_Gallery2-dc10b30ba0366126ed1ad5133b36e97d76335049.zip |
Reskin: stop at first photo after swipe from camera
Bug: 6399763
Bug: 7050303
Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index c31546b6b..68dc152e6 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -612,6 +612,7 @@ public class PhotoView extends GLView { mSize.height = getRotated(mRotation, h, w); } + private boolean mNeedToChangeToFilmstripWhenCentered = false; @Override public void draw(GLCanvas canvas, Rect r) { drawTileView(canvas, r); @@ -629,8 +630,11 @@ public class PhotoView extends GLView { boolean isCameraCenter = mIsCamera && isCenter && !canUndoLastPicture(); if (mWasCameraCenter && mIsCamera && !isCenter && !mFilmMode) { - // Temporary disabled to de-emphasize filmstrip. + setFilmMode(false); + mNeedToChangeToFilmstripWhenCentered = true; + } else if (isCenter && mNeedToChangeToFilmstripWhenCentered) { setFilmMode(true); + mNeedToChangeToFilmstripWhenCentered = false; } else if (!mWasCameraCenter && isCameraCenter && mFilmMode) { setFilmMode(false); } |