Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7e8cfe9 authored by Doris Liu's avatar Doris Liu
Browse files

Fix duration scale attribute for AnimatorSet 

Bug: 20160979
Change-Id: I876771a037d2c254fc53ad0bfa4880e69e427090
parent 105b8a5f

core/java/android/animation/AnimatorInflater.java

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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>



    <!-- ========================== -->