From 9452a829641ce51438b508d4884b28f72ecd63ae Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Tue, 9 Oct 2012 15:59:40 -0700
Subject: Fix lack of snapback on very short scroll

Bug: 7318609

snapToNeighborImage returns false if it didn't
actually need to move to a neighboring image, so
use this information to correctly snapback if
needed.

Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
---
 src/com/android/gallery3d/ui/PhotoView.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 8f5a84f6e..3086b2459 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1258,9 +1258,8 @@ public class PhotoView extends GLView {
                 return;
             }
 
-            if (mFilmMode && !mHadFling && mFirstScrollX) {
-                snapToNeighborImage();
-            } else {
+            if (!(mFilmMode && !mHadFling && mFirstScrollX
+                    && snapToNeighborImage())) {
                 snapback();
             }
         }
-- 
cgit v1.2.3