summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-07-13 18:57:58 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-13 18:57:58 -0700
commit3cd6f49bd8ba93feb1b308e6f0f32a06b47c9fc8 (patch)
treed4b8760007e7aa49c9b74654712d24b9d45e2bf5
parente7e2cf27dfcd531219d18cae11ff59bf1bb376dc (diff)
parentccab4f5c8320dfb8f820ca413bb11ec0153584dd (diff)
downloadandroid_packages_apps_Gallery2-3cd6f49bd8ba93feb1b308e6f0f32a06b47c9fc8.tar.gz
android_packages_apps_Gallery2-3cd6f49bd8ba93feb1b308e6f0f32a06b47c9fc8.tar.bz2
android_packages_apps_Gallery2-3cd6f49bd8ba93feb1b308e6f0f32a06b47c9fc8.zip
Merge "Gallery: fix white screen after rapid scrolling"
-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;