commit 3d81fdfd5916747b237229a2515152daf639447a
author Bobby Georgescu <georgescu@google.com> Tue Oct 09 17:08:27 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 09 17:08:27 2012 -0700
tree 9dfc18ba20e9dbfe817855178889e14b30753323
parent bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0
parent dc55d3b1a614b95a36aab60c06f7961a800ec85a

Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches

src/com/android/gallery3d/ui/PhotoView.java

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 8f5a84f..3086b24 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1258,9 +1258,8 @@
                 return;
             }
 
-            if (mFilmMode && !mHadFling && mFirstScrollX) {
-                snapToNeighborImage();
-            } else {
+            if (!(mFilmMode && !mHadFling && mFirstScrollX
+                    && snapToNeighborImage())) {
                 snapback();
             }
         }