Merge "Fix duration scale attribute for AnimatorSet"

core/java/android/animation/AnimatorInflater.java

@@ -698,7 +698,7 @@ public class AnimatorInflater {
                 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

@@ -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>
 
     <!-- ========================== -->