From 7bfc979594b083c36f6a08e49273ef7c9ad7b13a Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 28 Jan 2011 13:52:37 -0800 Subject: [PATCH] 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index c9044b4d06..ede029b05b 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -879,6 +879,11 @@ public abstract class PagedView extends ViewGroup { 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;