commit dd67b0d52521bb828bc31732fe3ac8b786a19cce
author Doris Liu <tianliu@google.com> Tue Apr 19 22:14:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 22:14:37 2016 +0000
tree 7ce36ba928822bb18eb7b4e01370af3e013725d4
parent 967d93440cd1386810bdfad50dcca4bff9bae722
parent 2987dffb7248392ca48d87817b27c09092b1d4bf

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

core/java/android/animation/AnimatorSet.java

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index e788d27..8ff38bb 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -559,7 +559,8 @@
         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 @@
         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();