summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2011-09-19 17:52:06 -0700
committerJustin Ho <justinho@google.com>2011-09-19 17:52:06 -0700
commita181bb4b8cd5dbd3390d95fec07620c272bd350c (patch)
tree068f41f6dad69dc634b0727413d7662ba82ffaf9 /core/java/android
parent4f92c9bb8d8484fc9a0dfc1549beedbd1ae8bf01 (diff)
downloadframeworks_base-a181bb4b8cd5dbd3390d95fec07620c272bd350c.zip
frameworks_base-a181bb4b8cd5dbd3390d95fec07620c272bd350c.tar.gz
frameworks_base-a181bb4b8cd5dbd3390d95fec07620c272bd350c.tar.bz2
Tuning Overscroller's scroll curve
Softer end + rounder curve with less contrast Bug: 5200575 Change-Id: Icff6ba3cf7ae052c80b2e80e2d2b07085fcb40ce
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/OverScroller.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java
index e571998..6aee5a0 100644
--- a/core/java/android/widget/OverScroller.java
+++ b/core/java/android/widget/OverScroller.java
@@ -584,10 +584,10 @@ public class OverScroller {
// A device specific coefficient adjusted to physical values.
private static float PHYSICAL_COEF;
- private static float DECELERATION_RATE = (float) (Math.log(0.75) / Math.log(0.9));
- private static final float INFLEXION = 0.4f; // Tension lines cross at (INFLEXION, 1)
- private static final float START_TENSION = 1.0f;
- private static final float END_TENSION = 0.6666f;
+ private static float DECELERATION_RATE = (float) (Math.log(0.78) / Math.log(0.9));
+ private static final float INFLEXION = 0.35f; // Tension lines cross at (INFLEXION, 1)
+ private static final float START_TENSION = 0.5f;
+ private static final float END_TENSION = 1.0f;
private static final float P1 = START_TENSION * INFLEXION;
private static final float P2 = 1.0f - END_TENSION * (1.0f - INFLEXION);