am c9ec035b: am 2622629f: am 9033d798: Fix Scroller interpolation

* commit 'c9ec035b9291055db6fc6def5b1310274d192c2b': Fix Scroller interpolation
2014-08-06 23:01:26 +00:00
parent 9fa355d1aa e0bcde8877
commit 669eca2176
1 changed files with 3 additions and 3 deletions
--- a/core/java/android/widget/Scroller.java
+++ b/core/java/android/widget/Scroller.java
@@ -589,10 +589,10 @@ public class Scroller  {
        @Override
        public float getInterpolation(float input) {
            final float interpolated = VISCOUS_FLUID_NORMALIZE * viscousFluid(input);
-            if (input > 0) {
-                return input + VISCOUS_FLUID_OFFSET;
+            if (interpolated > 0) {
+                return interpolated + VISCOUS_FLUID_OFFSET;
            }
-            return input;
+            return interpolated;
        }
    }
 }