commit 4a12b7f0ec9b8c77998485e69b632f166987c6c9
author Adam Cohen <adamcohen@google.com> Fri Jan 28 14:05:41 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 28 14:05:41 2011 -0800
tree 806b237078ba196f1245d7f6225298352580405d
parent d271c0a01121fe857769734c3d3e14ebdf05bf84
parent 91ed3d47f2f2ac1f9dce9ed69a5968e4b9de24d2

am 91ed3d47: am 7bfc9795: Clamping maximum overscroll amount

* commit '91ed3d47f2f2ac1f9dce9ed69a5968e4b9de24d2':
  Clamping maximum overscroll amount

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;