summaryrefslogtreecommitdiffstats
path: root/gallerycommon
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2016-07-13 09:25:51 +0800
committerLikai Ding <likaid@codeaurora.org>2016-07-13 09:25:51 +0800
commitccab4f5c8320dfb8f820ca413bb11ec0153584dd (patch)
treebc879ff842f31b0d3abfe79d7148cb46473cd76a /gallerycommon
parentb7f0f7f067f5979e7e7e52aa9836ed3dbcca475c (diff)
downloadandroid_packages_apps_Gallery2-ccab4f5c8320dfb8f820ca413bb11ec0153584dd.tar.gz
android_packages_apps_Gallery2-ccab4f5c8320dfb8f820ca413bb11ec0153584dd.tar.bz2
android_packages_apps_Gallery2-ccab4f5c8320dfb8f820ca413bb11ec0153584dd.zip
Gallery: fix white screen after rapid scrolling
If edge is reached when velocity is high, distance may be a large negative value, causing very long animation duration. Fix it by checking absolute value. Change-Id: I71039a9ddd76f25c75582da4098cb091148cafba CRs-Fixed: 1022927
Diffstat (limited to 'gallerycommon')
-rw-r--r--gallerycommon/src/com/android/gallery3d/common/OverScroller.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/OverScroller.java b/gallerycommon/src/com/android/gallery3d/common/OverScroller.java
index a03c45196..6becb3a97 100644
--- a/gallerycommon/src/com/android/gallery3d/common/OverScroller.java
+++ b/gallerycommon/src/com/android/gallery3d/common/OverScroller.java
@@ -855,7 +855,7 @@ public class OverScroller {
float distance = mVelocity * mVelocity / (2.0f * Math.abs(mDeceleration));
final float sign = Math.signum(mVelocity);
- if (distance > mOver) {
+ if (Math.abs(distance) > mOver) {
// Default deceleration is not sufficient to slow us down before boundary
mDeceleration = - sign * mVelocity * mVelocity / (2.0f * mOver);
distance = mOver;