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

Commit d7c2f623 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix problems with early ending of Sequencer"

parents ba4da86a f1b9b464

core/java/android/animation/Animator.java

+1 −0
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ public class Animator<T> extends Animatable { 
            setCurrentPlayTime(getCurrentPlayTime());

        }

        mPlayingState = STOPPED;

        mStartedDelay = false;

        sPendingAnimations.add(this);

        if (sAnimationHandler == null) {

            sAnimationHandler = new AnimationHandler();

core/java/android/animation/Sequencer.java

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,10 @@ public final class Sequencer extends Animatable { 
    @Override

    public void end() {

        mCanceled = true;

        if (mSortedNodes.size() != mNodes.size()) {

            // hasn't been started yet - sort the nodes now, then end them

            sortNodes();

        }

        if (mSortedNodes.size() > 0) {

            for (Node node : mSortedNodes) {

                node.animation.end();