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

Commit 24d6ea8e authored by wilsonshih's avatar wilsonshih
Browse files

Correct AnimationSet#getTransformationAt 

...where the transformation were overwrite by latest Animation in the
sets.

Bug: 339155482
Test: Verify CustomizeActivityAnimation can play the AnimationSet which
contains more than one matrix change correctly.

Change-Id: Iaa917bd17a82a754aac159c6834dc0a8a1a9a0b4
parent b0133d13

core/java/android/view/animation/AnimationSet.java

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ public class AnimationSet extends Animation { 
            final Animation a = mAnimations.get(i);



            temp.clear();

            a.getTransformationAt(interpolatedTime, t);

            a.getTransformationAt(interpolatedTime, temp);

            t.compose(temp);

        }

    }

core/java/android/view/animation/Transformation.java

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public class Transformation { 
        mHasClipRect = false;

        mAlpha = 1.0f;

        mTransformationType = TYPE_BOTH;

        mInsets = Insets.NONE;

    }



    /**