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

Commit 86ac81b6 authored by Doris Liu's avatar Doris Liu Committed by android-build-merger
Browse files

Merge "Fix pause/resume for AnimatorSet" into nyc-dev 

am: dd67b0d5

* commit 'dd67b0d5':
  Fix pause/resume for AnimatorSet

Change-Id: I235c869ce54fdf789898f8663a92fd22a4872600
parents c068f915 dd67b0d5

core/java/android/animation/AnimatorSet.java

+4 −2
Original line number Diff line number Diff line
@@ -559,7 +559,8 @@ public final class AnimatorSet extends Animator { 
        boolean previouslyPaused = mPaused;

        super.pause();

        if (!previouslyPaused && mPaused) {

            if (mDelayAnim != null) {

            if (mDelayAnim.isStarted()) {

                // If delay hasn't passed, pause the start delay animator.

                mDelayAnim.pause();

            } else {

                int size = mNodes.size();
@@ -578,7 +579,8 @@ public final class AnimatorSet extends Animator { 
        boolean previouslyPaused = mPaused;

        super.resume();

        if (previouslyPaused && !mPaused) {

            if (mDelayAnim != null) {

            if (mDelayAnim.isStarted()) {

                // If start delay hasn't passed, resume the previously paused start delay animator

                mDelayAnim.resume();

            } else {

                int size = mNodes.size();