summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-04 11:15:43 -0700
committerBobby Georgescu <georgescu@google.com>2012-10-04 11:15:43 -0700
commitb1a513974d59c1dc14e004338b6795d6c3c5e5e8 (patch)
treed7d94d2f1f0b24138b3c97766f7d801bde3a53f0 /src
parent2abc1350cde24e810f6437592f099c149ce19ada (diff)
downloadandroid_packages_apps_Gallery2-b1a513974d59c1dc14e004338b6795d6c3c5e5e8.tar.gz
android_packages_apps_Gallery2-b1a513974d59c1dc14e004338b6795d6c3c5e5e8.tar.bz2
android_packages_apps_Gallery2-b1a513974d59c1dc14e004338b6795d6c3c5e5e8.zip
Snap back photo after swipe in y-direction in filmstrip
Bug: 7283537 Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index a5a15bf43..a7357e034 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1259,10 +1259,11 @@ public class PhotoView extends GLView {
mIgnoreUpEvent = false;
return;
}
- if (!mFilmMode || mHadFling) {
- snapback();
- } else {
+
+ if (mFilmMode && !mHadFling && mFirstScrollX) {
snapToNeighborImage();
+ } else {
+ snapback();
}
}