Simplify KeyframeSet to avoid caching.

Bug 27367940


Change-Id: I76426def5d4b46c0a0ba534fd952f6c41725c74a

1 files changed, 0 insertions, 26 deletions

diff --git a/core/java/android/animation/FloatKeyframeSet.java b/core/java/android/animation/FloatKeyframeSet.java
index 017307926cac..11837b5ca013 100644
--- a/core/java/android/animation/FloatKeyframeSet.java
+++ b/core/java/android/animation/FloatKeyframeSet.java
@@ -31,11 +31,6 @@ import java.util.List;
  * Object equivalents of these primitive types.</p>
  */
 class FloatKeyframeSet extends KeyframeSet implements Keyframes.FloatKeyframes {
-    private float firstValue;
-    private float lastValue;
-    private float deltaValue;
-    private boolean firstTime = true;
-
     public FloatKeyframeSet(FloatKeyframe... keyframes) {
         super(keyframes);
     }
@@ -58,28 +53,7 @@ class FloatKeyframeSet extends KeyframeSet implements Keyframes.FloatKeyframes {
     }
 
     @Override
-    public void invalidateCache() {
-        firstTime = true;
-    }
-
-    @Override
     public float getFloatValue(float fraction) {
-        if (mNumKeyframes == 2) {
-            if (firstTime) {
-                firstTime = false;
-                firstValue = ((FloatKeyframe) mKeyframes.get(0)).getFloatValue();
-                lastValue = ((FloatKeyframe) mKeyframes.get(1)).getFloatValue();
-                deltaValue = lastValue - firstValue;
-            }
-            if (mInterpolator != null) {
-                fraction = mInterpolator.getInterpolation(fraction);
-            }
-            if (mEvaluator == null) {
-                return firstValue + fraction * deltaValue;
-            } else {
-                return ((Number)mEvaluator.evaluate(fraction, firstValue, lastValue)).floatValue();
-            }
-        }
         if (fraction <= 0f) {
             final FloatKeyframe prevKeyframe = (FloatKeyframe) mKeyframes.get(0);
             final FloatKeyframe nextKeyframe = (FloatKeyframe) mKeyframes.get(1);