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

Commit be16bf4b authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix duration scale attribute for AnimatorSet"

parents 7d43893b a7e8cfe9

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>



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