Merge "Fix duration scale attribute for AnimatorSet"

2015-04-13 20:58:24 +00:00
parent 7d43893bb9 a7e8cfe978
commit be16bf4be1
2 changed files with 2 additions and 1 deletions
--- a/core/java/android/animation/AnimatorInflater.java
+++ b/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();