From a7e8cfe97892a984e49292f9221b2db568b6364d Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 13 Apr 2015 11:27:32 -0700
Subject: Fix duration scale attribute for AnimatorSet

Bug: 20160979
Change-Id: I876771a037d2c254fc53ad0bfa4880e69e427090
---
 core/java/android/animation/AnimatorInflater.java | 2 +-
 core/res/res/values/attrs.xml                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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>
 
     <!-- ========================== -->
-- 
cgit v1.2.3-59-g8ed1b