commit 458f20ed5a3be51ab1166256dfeece37fa7e3c66
author Doris Liu <tianliu@google.com> Mon Aug 10 17:32:54 2015 -0700
committer Doris Liu <tianliu@google.com> Tue Aug 11 15:21:37 2015 -0700
tree df5d67741f7863e83789a7c54476421f26e56d80
parent 8ca3e7da89b526a7ef8dbcf22defe408aec137b6

Exclude DelayAnim in child animation value setup

Change-Id: I5f3274d3c1a6fee7b22bb59cdb80f9bce8c4420e

core/java/android/animation/AnimatorSet.java

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index ff7705b..5b88c8e 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -415,7 +415,8 @@
     public boolean isRunning() {
         int size = mNodes.size();
         for (int i = 0; i < size; i++) {
-            if (mNodes.get(i).mAnimation.isRunning()) {
+            Node node = mNodes.get(i);
+            if (node != mRootNode && node.mAnimation.isRunning()) {
                 return true;
             }
         }
@@ -512,7 +513,9 @@
         int size = mNodes.size();
         for (int i = 0; i < size; i++) {
             Node node = mNodes.get(i);
-            node.mAnimation.setupStartValues();
+            if (node != mRootNode) {
+                node.mAnimation.setupStartValues();
+            }
         }
     }
 
@@ -521,7 +524,9 @@
         int size = mNodes.size();
         for (int i = 0; i < size; i++) {
             Node node = mNodes.get(i);
-            node.mAnimation.setupEndValues();
+            if (node != mRootNode) {
+                node.mAnimation.setupEndValues();
+            }
         }
     }
 
@@ -536,7 +541,9 @@
                 int size = mNodes.size();
                 for (int i = 0; i < size; i++) {
                     Node node = mNodes.get(i);
-                    node.mAnimation.pause();
+                    if (node != mRootNode) {
+                        node.mAnimation.pause();
+                    }
                 }
             }
         }
@@ -553,7 +560,9 @@
                 int size = mNodes.size();
                 for (int i = 0; i < size; i++) {
                     Node node = mNodes.get(i);
-                    node.mAnimation.resume();
+                    if (node != mRootNode) {
+                        node.mAnimation.resume();
+                    }
                 }
             }
         }