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

Commit 2987dffb authored by Doris Liu's avatar Doris Liu
Browse files

Fix pause/resume for AnimatorSet 

Bug: 28251945
Change-Id: Ie98c779791bf181e2e8fbf38bbd453228ce43310
parent d0498373

core/java/android/animation/AnimatorSet.java

+4 −2
Original line number Diff line number Diff line
@@ -538,7 +538,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();
@@ -557,7 +558,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();