diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-01-28 13:52:37 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-01-28 13:56:01 -0800 |
| commit | 7bfc979594b083c36f6a08e49273ef7c9ad7b13a (patch) | |
| tree | d80fa247fe2d10cbd529426920b0a6c0981d15b5 /src/com/android/launcher2/PagedView.java | |
| parent | 860f4c5a82d4b3c8d5444f986176a9af6f085df7 (diff) | |
| download | android_packages_apps_Trebuchet-7bfc979594b083c36f6a08e49273ef7c9ad7b13a.tar.gz android_packages_apps_Trebuchet-7bfc979594b083c36f6a08e49273ef7c9ad7b13a.tar.bz2 android_packages_apps_Trebuchet-7bfc979594b083c36f6a08e49273ef7c9ad7b13a.zip | |
Clamping maximum overscroll amount
- It was possible to crash launcher if you pulled really really far
to the right
Change-Id: I3ec45c7cbda2c4036e2e2359f2aa617ce7091bcd
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index c9044b4d0..ede029b05 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; |