commit 7bfc979594b083c36f6a08e49273ef7c9ad7b13a
author Adam Cohen <adamcohen@google.com> Fri Jan 28 13:52:37 2011 -0800
committer Adam Cohen <adamcohen@google.com> Fri Jan 28 13:56:01 2011 -0800
tree d80fa247fe2d10cbd529426920b0a6c0981d15b5
parent 860f4c5a82d4b3c8d5444f986176a9af6f085df7

Clamping maximum overscroll amount

- It was possible to crash launcher if you pulled really really far
  to the right

Change-Id: I3ec45c7cbda2c4036e2e2359f2aa617ce7091bcd

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;