From 54b9e5baa30a5b5f3f5dac1db877f389c250cafc Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Tue, 5 Aug 2014 16:56:49 -0700
Subject: [PATCH] Fix Scroller interpolation

The ViscousFluid interpolator simply returns the input value and not the
interpolation of that value.

Issue #16815073 Scroller.ViscousFluidInterpolator short circuited

Change-Id: Ifa189026c1396a42a2348260a2a54cf0c3caad08
---
 core/java/android/widget/Scroller.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java
index 1a0ce9c8333da..5e88a968271e7 100644
--- 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;
         }
     }
 }