diff options
| -rw-r--r-- | core/java/android/animation/AnimatorInflater.java | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java index df5a4cb9a366..224e8e9eae09 100644 --- 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(); diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index cbd74cdafa54..0f50502e24df 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> <!-- ========================== --> |