Merge "Fixed problem with setting updated values on existing animators" (f3e0268b) · Commits · e / os / android_frameworks_base

core/java/android/animation/PropertyValuesHolder.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -665,6 +665,11 @@ public class PropertyValuesHolder implements Cloneable {
	public IntPropertyValuesHolder(String propertyName, int... values) {		public IntPropertyValuesHolder(String propertyName, int... values) {
	super(propertyName);		super(propertyName);
	setIntValues(values);		setIntValues(values);
			}

			@Override
			public void setIntValues(int... values) {
			super.setIntValues(values);
	mIntKeyframeSet = (IntKeyframeSet) mKeyframeSet;		mIntKeyframeSet = (IntKeyframeSet) mKeyframeSet;
	}		}

	@@ -722,6 +727,11 @@ public class PropertyValuesHolder implements Cloneable {
	public FloatPropertyValuesHolder(String propertyName, float... values) {		public FloatPropertyValuesHolder(String propertyName, float... values) {
	super(propertyName);		super(propertyName);
	setFloatValues(values);		setFloatValues(values);
			}

			@Override
			public void setFloatValues(float... values) {
			super.setFloatValues(values);
	mFloatKeyframeSet = (FloatKeyframeSet) mKeyframeSet;		mFloatKeyframeSet = (FloatKeyframeSet) mKeyframeSet;
	}		}