commit be16bf4be12b352d8be1ee85ff414a46ed5daa27
author Doris Liu <tianliu@google.com> Mon Apr 13 20:58:24 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 13 20:58:25 2015 +0000
tree c680c01777d5461890699bb60d440d7174d3f339
parent 7d43893bb998cb0909e021a9968ad3097246e43e
parent a7e8cfe97892a984e49292f9221b2db568b6364d

Merge "Fix duration scale attribute for AnimatorSet"

core/java/android/animation/AnimatorInflater.java

diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java
index df5a4cb..224e8e9 100644
--- a/core/java/android/animation/AnimatorInflater.java
+++ b/core/java/android/animation/AnimatorInflater.java
@@ -698,7 +698,7 @@
                 int ordering = a.getInt(R.styleable.AnimatorSet_ordering, TOGETHER);
                 createAnimatorFromXml(res, theme, parser, attrs, (AnimatorSet) anim, ordering,
                         pixelSize);
-                final int hint = a.getInt(R.styleable.Animator_durationScaleHint,
+                final int hint = a.getInt(R.styleable.AnimatorSet_durationScaleHint,
                         HINT_NO_SCALE);
                 anim.setDurationScaleHint(hint, res);
                 a.recycle();

core/res/res/values/attrs.xml

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index cbd74cd..0f50502 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -6042,6 +6042,7 @@
             <!-- child animations should be played sequentially, in the same order as the xml. -->
             <enum name="sequentially" value="1" />
         </attr>
+        <attr name="durationScaleHint" />
     </declare-styleable>
 
     <!-- ========================== -->