commit 0360e6f5ff06f34634246fa7ce38ad5e4e8222f4
author Eric Fischer <enf@google.com> Fri Jan 28 15:09:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 28 15:09:52 2011 -0800
tree eab5a7baca0b1379d0e744ab612002fad6e82ba7
parent 7bfc979594b083c36f6a08e49273ef7c9ad7b13a
parent 067db584184d96dd4873fbe8a65c72f15758acaa

Merge "Import revised translations.  DO NOT MERGE" into honeycomb

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index c9044b4..ede029b 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -879,6 +879,11 @@
         if (f == 0) return;
         f = f / (Math.abs(f)) * (overScrollInfluenceCurve(Math.abs(f)));
 
+        // Clamp this factor, f, to -1 < f < 1
+        if (Math.abs(f) >= 1) {
+            f /= Math.abs(f);
+        }
+
         int overScrollAmount = (int) Math.round(OVERSCROLL_DAMP_FACTOR * f * screenSize);
         if (amount < 0) {
             mScrollX = overScrollAmount;