diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-09 17:09:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 17:09:35 -0700 |
| commit | 52cb523e386cda894ef3076dd0ff4c36c7ced11f (patch) | |
| tree | 3694e66cc8ea9914dae0a6a1b73d0797396ee77f | |
| parent | 893fd5f78cd3cfd5801835145f2456693a6d4230 (diff) | |
| parent | 04d0dbc40b7b6a2bc6f05698c6b97b89f665d002 (diff) | |
| download | android_packages_apps_Snap-52cb523e386cda894ef3076dd0ff4c36c7ced11f.tar.gz android_packages_apps_Snap-52cb523e386cda894ef3076dd0ff4c36c7ced11f.tar.bz2 android_packages_apps_Snap-52cb523e386cda894ef3076dd0ff4c36c7ced11f.zip | |
am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
* commit '3d81fdfd5916747b237229a2515152daf639447a':
Fix lack of snapback on very short scroll
| -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(); } } |