Merge "Fix per-keyframe interpolators" (9e6afce3) · Commits · e / os / android_frameworks_base

core/java/android/animation/FloatKeyframeSet.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -118,13 +118,14 @@ class FloatKeyframeSet extends KeyframeSet implements Keyframes.FloatKeyframes {
	FloatKeyframe nextKeyframe = (FloatKeyframe) mKeyframes.get(i);		FloatKeyframe nextKeyframe = (FloatKeyframe) mKeyframes.get(i);
	if (fraction < nextKeyframe.getFraction()) {		if (fraction < nextKeyframe.getFraction()) {
	final TimeInterpolator interpolator = nextKeyframe.getInterpolator();		final TimeInterpolator interpolator = nextKeyframe.getInterpolator();
	if (interpolator != null) {
	fraction = interpolator.getInterpolation(fraction);
	}
	float intervalFraction = (fraction - prevKeyframe.getFraction()) /		float intervalFraction = (fraction - prevKeyframe.getFraction()) /
	(nextKeyframe.getFraction() - prevKeyframe.getFraction());		(nextKeyframe.getFraction() - prevKeyframe.getFraction());
	float prevValue = prevKeyframe.getFloatValue();		float prevValue = prevKeyframe.getFloatValue();
	float nextValue = nextKeyframe.getFloatValue();		float nextValue = nextKeyframe.getFloatValue();
			// Apply interpolator on the proportional duration.
			if (interpolator != null) {
			intervalFraction = interpolator.getInterpolation(intervalFraction);
			}
	return mEvaluator == null ?		return mEvaluator == null ?
	prevValue + intervalFraction * (nextValue - prevValue) :		prevValue + intervalFraction * (nextValue - prevValue) :
	((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).		((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

core/java/android/animation/IntKeyframeSet.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -117,13 +117,14 @@ class IntKeyframeSet extends KeyframeSet implements Keyframes.IntKeyframes {
	IntKeyframe nextKeyframe = (IntKeyframe) mKeyframes.get(i);		IntKeyframe nextKeyframe = (IntKeyframe) mKeyframes.get(i);
	if (fraction < nextKeyframe.getFraction()) {		if (fraction < nextKeyframe.getFraction()) {
	final TimeInterpolator interpolator = nextKeyframe.getInterpolator();		final TimeInterpolator interpolator = nextKeyframe.getInterpolator();
	if (interpolator != null) {
	fraction = interpolator.getInterpolation(fraction);
	}
	float intervalFraction = (fraction - prevKeyframe.getFraction()) /		float intervalFraction = (fraction - prevKeyframe.getFraction()) /
	(nextKeyframe.getFraction() - prevKeyframe.getFraction());		(nextKeyframe.getFraction() - prevKeyframe.getFraction());
	int prevValue = prevKeyframe.getIntValue();		int prevValue = prevKeyframe.getIntValue();
	int nextValue = nextKeyframe.getIntValue();		int nextValue = nextKeyframe.getIntValue();
			// Apply interpolator on the proportional duration.
			if (interpolator != null) {
			intervalFraction = interpolator.getInterpolation(intervalFraction);
			}
	return mEvaluator == null ?		return mEvaluator == null ?
	prevValue + (int)(intervalFraction * (nextValue - prevValue)) :		prevValue + (int)(intervalFraction * (nextValue - prevValue)) :
	((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).		((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

core/java/android/animation/KeyframeSet.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -201,7 +201,6 @@ class KeyframeSet implements Keyframes {
	* @return The animated value.		* @return The animated value.
	*/		*/
	public Object getValue(float fraction) {		public Object getValue(float fraction) {

	// Special-case optimization for the common case of only two keyframes		// Special-case optimization for the common case of only two keyframes
	if (mNumKeyframes == 2) {		if (mNumKeyframes == 2) {
	if (mInterpolator != null) {		if (mInterpolator != null) {
	@@ -238,12 +237,13 @@ class KeyframeSet implements Keyframes {
	Keyframe nextKeyframe = mKeyframes.get(i);		Keyframe nextKeyframe = mKeyframes.get(i);
	if (fraction < nextKeyframe.getFraction()) {		if (fraction < nextKeyframe.getFraction()) {
	final TimeInterpolator interpolator = nextKeyframe.getInterpolator();		final TimeInterpolator interpolator = nextKeyframe.getInterpolator();
	if (interpolator != null) {
	fraction = interpolator.getInterpolation(fraction);
	}
	final float prevFraction = prevKeyframe.getFraction();		final float prevFraction = prevKeyframe.getFraction();
	float intervalFraction = (fraction - prevFraction) /		float intervalFraction = (fraction - prevFraction) /
	(nextKeyframe.getFraction() - prevFraction);		(nextKeyframe.getFraction() - prevFraction);
			// Apply interpolator on the proportional duration.
			if (interpolator != null) {
			intervalFraction = interpolator.getInterpolation(intervalFraction);
			}
	return mEvaluator.evaluate(intervalFraction, prevKeyframe.getValue(),		return mEvaluator.evaluate(intervalFraction, prevKeyframe.getValue(),
	nextKeyframe.getValue());		nextKeyframe.getValue());
	}		}