diff options
| author | Chet Haase <chet@google.com> | 2011-02-15 06:46:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-15 06:46:48 -0800 |
| commit | 6b5e593725d1f323f64b6f13cd58aad4af822fe1 (patch) | |
| tree | 6b3dde0faaeef75232362b8299704a73c05369c1 /core/java/android/animation | |
| parent | 773a9c5c0f379c01b563a5578640bedc07b3288f (diff) | |
| parent | 750e12e18f7ce9654cadf11b9e933afb29b59311 (diff) | |
| download | frameworks_base-6b5e593725d1f323f64b6f13cd58aad4af822fe1.zip frameworks_base-6b5e593725d1f323f64b6f13cd58aad4af822fe1.tar.gz frameworks_base-6b5e593725d1f323f64b6f13cd58aad4af822fe1.tar.bz2 | |
Merge "Fix when >2 keyframes supplied"
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/FloatKeyframeSet.java | 6 | ||||
| -rw-r--r-- | core/java/android/animation/IntKeyframeSet.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/animation/FloatKeyframeSet.java b/core/java/android/animation/FloatKeyframeSet.java index 4009f13..377b5a0 100644 --- a/core/java/android/animation/FloatKeyframeSet.java +++ b/core/java/android/animation/FloatKeyframeSet.java @@ -87,7 +87,7 @@ class FloatKeyframeSet extends KeyframeSet { } float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction); return mEvaluator == null ? - prevValue + fraction * (nextValue - prevValue) : + prevValue + intervalFraction * (nextValue - prevValue) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)). floatValue(); } else if (fraction >= 1f) { @@ -103,7 +103,7 @@ class FloatKeyframeSet extends KeyframeSet { } float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction); return mEvaluator == null ? - prevValue + fraction * (nextValue - prevValue) : + prevValue + intervalFraction * (nextValue - prevValue) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)). floatValue(); } @@ -120,7 +120,7 @@ class FloatKeyframeSet extends KeyframeSet { float prevValue = prevKeyframe.getFloatValue(); float nextValue = nextKeyframe.getFloatValue(); return mEvaluator == null ? - prevValue + fraction * (nextValue - prevValue) : + prevValue + intervalFraction * (nextValue - prevValue) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)). floatValue(); } diff --git a/core/java/android/animation/IntKeyframeSet.java b/core/java/android/animation/IntKeyframeSet.java index 5629c5e..7b7c876 100644 --- a/core/java/android/animation/IntKeyframeSet.java +++ b/core/java/android/animation/IntKeyframeSet.java @@ -87,7 +87,7 @@ class IntKeyframeSet extends KeyframeSet { } float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction); return mEvaluator == null ? - prevValue + (int)(fraction * (nextValue - prevValue)) : + prevValue + (int)(intervalFraction * (nextValue - prevValue)) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)). intValue(); } else if (fraction >= 1f) { @@ -103,7 +103,7 @@ class IntKeyframeSet extends KeyframeSet { } float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction); return mEvaluator == null ? - prevValue + (int)(fraction * (nextValue - prevValue)) : + prevValue + (int)(intervalFraction * (nextValue - prevValue)) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).intValue(); } IntKeyframe prevKeyframe = (IntKeyframe) mKeyframes.get(0); @@ -119,7 +119,7 @@ class IntKeyframeSet extends KeyframeSet { int prevValue = prevKeyframe.getIntValue(); int nextValue = nextKeyframe.getIntValue(); return mEvaluator == null ? - prevValue + (int)(fraction * (nextValue - prevValue)) : + prevValue + (int)(intervalFraction * (nextValue - prevValue)) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)). intValue(); } |