diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-09 17:08:27 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 17:08:27 -0700 |
commit | 04d0dbc40b7b6a2bc6f05698c6b97b89f665d002 (patch) | |
tree | dbd3d231e4631da11c39010a8251852644645eec /src/com | |
parent | c7bf12b9d336b73ea7885294da1029147c6e67a6 (diff) | |
parent | 9452a829641ce51438b508d4884b28f72ecd63ae (diff) | |
download | android_packages_apps_Snap-04d0dbc40b7b6a2bc6f05698c6b97b89f665d002.tar.gz android_packages_apps_Snap-04d0dbc40b7b6a2bc6f05698c6b97b89f665d002.tar.bz2 android_packages_apps_Snap-04d0dbc40b7b6a2bc6f05698c6b97b89f665d002.zip |
Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 5 |
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(); } } |