Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches

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);
             }