summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2012-05-25 08:08:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-25 08:08:28 -0700
commit903f83944aa056644373e8d0660bddf2861f0390 (patch)
treeef20cc7e385b604cf79931da74c444c0b22e54a3
parentfe1ade179e5285178c691b5b397d59a8d927d0e4 (diff)
parent95c2aeab0bf398b45d8a9c562fd110d1e3756139 (diff)
downloadandroid_packages_apps_Gallery2-903f83944aa056644373e8d0660bddf2861f0390.tar.gz
android_packages_apps_Gallery2-903f83944aa056644373e8d0660bddf2861f0390.tar.bz2
android_packages_apps_Gallery2-903f83944aa056644373e8d0660bddf2861f0390.zip
am 95c2aeab: Force to stop scrolling in filmstrip mode.
* commit '95c2aeab0bf398b45d8a9c562fd110d1e3756139': Force to stop scrolling in filmstrip mode.
-rw-r--r--src/com/android/gallery3d/ui/PositionController.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java
index d085c4d49..db77b99ba 100644
--- a/src/com/android/gallery3d/ui/PositionController.java
+++ b/src/com/android/gallery3d/ui/PositionController.java
@@ -1060,6 +1060,7 @@ class PositionController {
public void stopScrolling() {
if (mPlatform.mAnimationStartTime == NO_ANIMATION) return;
+ if (mFilmMode) mFilmScroller.forceFinished(true);
mPlatform.mFromX = mPlatform.mToX = mPlatform.mCurrentX;
}