summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-09 15:59:40 -0700
committerBobby Georgescu <georgescu@google.com>2012-10-09 16:00:25 -0700
commit9452a829641ce51438b508d4884b28f72ecd63ae (patch)
treed90aa2c188eadc9b57590f33cba5854cb51910d0 /src/com
parentd69035a67e0c650e2aa076ee678a6f9a82dffa77 (diff)
downloadandroid_packages_apps_Snap-9452a829641ce51438b508d4884b28f72ecd63ae.tar.gz
android_packages_apps_Snap-9452a829641ce51438b508d4884b28f72ecd63ae.tar.bz2
android_packages_apps_Snap-9452a829641ce51438b508d4884b28f72ecd63ae.zip
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
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java5
1 files changed, 2 insertions, 3 deletions
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();
}
}