Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575"

This commit is contained in:
Justin Ho
2011-09-19 18:06:13 -07:00
committed by Android (Google) Code Review

View File

@@ -584,10 +584,10 @@ public class OverScroller {
// A device specific coefficient adjusted to physical values. // A device specific coefficient adjusted to physical values.
private static float PHYSICAL_COEF; private static float PHYSICAL_COEF;
private static float DECELERATION_RATE = (float) (Math.log(0.75) / Math.log(0.9)); private static float DECELERATION_RATE = (float) (Math.log(0.78) / Math.log(0.9));
private static final float INFLEXION = 0.4f; // Tension lines cross at (INFLEXION, 1) private static final float INFLEXION = 0.35f; // Tension lines cross at (INFLEXION, 1)
private static final float START_TENSION = 1.0f; private static final float START_TENSION = 0.5f;
private static final float END_TENSION = 0.6666f; private static final float END_TENSION = 1.0f;
private static final float P1 = START_TENSION * INFLEXION; private static final float P1 = START_TENSION * INFLEXION;
private static final float P2 = 1.0f - END_TENSION * (1.0f - INFLEXION); private static final float P2 = 1.0f - END_TENSION * (1.0f - INFLEXION);