diff options
| author | Doris Liu <tianliu@google.com> | 2015-04-13 11:27:32 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2015-04-13 11:29:19 -0700 |
| commit | a7e8cfe97892a984e49292f9221b2db568b6364d (patch) | |
| tree | 921f2fbee5a717587e735a7fcb3be2d5b732acf5 /core/java/android/animation | |
| parent | 105b8a5f4f4874628277815fe44b90071a827eb8 (diff) | |
| download | frameworks_base-a7e8cfe97892a984e49292f9221b2db568b6364d.zip frameworks_base-a7e8cfe97892a984e49292f9221b2db568b6364d.tar.gz frameworks_base-a7e8cfe97892a984e49292f9221b2db568b6364d.tar.bz2 | |
Fix duration scale attribute for AnimatorSet
Bug: 20160979
Change-Id: I876771a037d2c254fc53ad0bfa4880e69e427090
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/AnimatorInflater.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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(); |