am a4f5c521: am d9a1ccfa: Merge "Set existing TypeEvaluator on new KeyframeSet when changing object values" into lmp-dev

* commit 'a4f5c521457b0a9de2862478730c12fd62cf4121': Set existing TypeEvaluator on new KeyframeSet when changing object values
2014-07-15 19:12:05 +00:00
parent 7b273dbb78 2b3e522b57
commit ba2d03e267
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/animation/PropertyValuesHolder.java
+++ b/core/java/android/animation/PropertyValuesHolder.java
@@ -631,6 +631,9 @@ public class PropertyValuesHolder implements Cloneable {
    public void setObjectValues(Object... values) {
        mValueType = values[0].getClass();
        mKeyframeSet = KeyframeSet.ofObject(values);
+        if (mEvaluator != null) {
+            mKeyframeSet.setEvaluator(mEvaluator);
+        }
    }

    /**