commit 86759039f3b9616b312b95176ec33c3a5fbd20cf
author George Mount <mount@google.com> Thu Sep 26 20:56:28 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 26 20:56:28 2013 +0000
tree 793ff184872b4b1635ae1890586dc482c34fd3bf
parent 9f68c104249984b2c8d35b13399ac23606cc0acc
parent f8c40cfc72f8f443b167f9452aba859fa83af39f

Merge "Set evaluator after setting values so that it can take effect."

core/java/android/animation/AnimatorInflater.java

diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java
index d753e32..c024c27 100644
--- a/core/java/android/animation/AnimatorInflater.java
+++ b/core/java/android/animation/AnimatorInflater.java
@@ -215,7 +215,7 @@
                 (toType <= TypedValue.TYPE_LAST_COLOR_INT))) {
             // special case for colors: ignore valueType and get ints
             getFloats = false;
-            anim.setEvaluator(new ArgbEvaluator());
+            evaluator = new ArgbEvaluator();
         }
 
         if (getFloats) {