diff options
| author | Doris Liu <tianliu@google.com> | 2015-03-31 15:17:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-31 15:17:32 +0000 |
| commit | 9e6afce34a07257bbd15b51851ac7394823e0ab7 (patch) | |
| tree | 9ade0df99871f0104bbd9c0227434c6c28002f32 /core/java/android/animation/IntKeyframeSet.java | |
| parent | 3af4330c5371f20ac5a378e6abe6bf1c356b0a06 (diff) | |
| parent | 6df99053ebd6d32ed1c0e83516b480a6843770c3 (diff) | |
| download | frameworks_base-9e6afce34a07257bbd15b51851ac7394823e0ab7.zip frameworks_base-9e6afce34a07257bbd15b51851ac7394823e0ab7.tar.gz frameworks_base-9e6afce34a07257bbd15b51851ac7394823e0ab7.tar.bz2 | |
Merge "Fix per-keyframe interpolators"
Diffstat (limited to 'core/java/android/animation/IntKeyframeSet.java')
| -rw-r--r-- | core/java/android/animation/IntKeyframeSet.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/animation/IntKeyframeSet.java b/core/java/android/animation/IntKeyframeSet.java index 12a4bf9..73f9af1 100644 --- a/core/java/android/animation/IntKeyframeSet.java +++ b/core/java/android/animation/IntKeyframeSet.java @@ -117,13 +117,14 @@ class IntKeyframeSet extends KeyframeSet implements Keyframes.IntKeyframes { IntKeyframe nextKeyframe = (IntKeyframe) mKeyframes.get(i); if (fraction < nextKeyframe.getFraction()) { final TimeInterpolator interpolator = nextKeyframe.getInterpolator(); - if (interpolator != null) { - fraction = interpolator.getInterpolation(fraction); - } float intervalFraction = (fraction - prevKeyframe.getFraction()) / (nextKeyframe.getFraction() - prevKeyframe.getFraction()); int prevValue = prevKeyframe.getIntValue(); int nextValue = nextKeyframe.getIntValue(); + // Apply interpolator on the proportional duration. + if (interpolator != null) { + intervalFraction = interpolator.getInterpolation(intervalFraction); + } return mEvaluator == null ? prevValue + (int)(intervalFraction * (nextValue - prevValue)) : ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)). |