Merge "Change the spring constants for EdgeEffect" into sc-dev (6f668bf6) · Commits · e / os / android_frameworks_base

core/java/android/widget/EdgeEffect.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -117,12 +117,12 @@ public class EdgeEffect {
	/**		/**
	* The natural frequency of the stretch spring.		* The natural frequency of the stretch spring.
	*/		*/
	private static final double NATURAL_FREQUENCY = 14.4222;		private static final double NATURAL_FREQUENCY = 17.55;

	/**		/**
	* The damping ratio of the stretch spring.		* The damping ratio of the stretch spring.
	*/		*/
	private static final double DAMPING_RATIO = 0.875;		private static final double DAMPING_RATIO = 0.92;

	/** @hide */		/** @hide */
	@IntDef({TYPE_GLOW, TYPE_STRETCH})		@IntDef({TYPE_GLOW, TYPE_STRETCH})