commit ff7913d48112cb6beb4fb486832a00becdf4bc26
author Doris Liu <tianliu@google.com> Thu Aug 06 18:09:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 06 18:09:08 2015 +0000
tree 3baccabdb1f47b79ab64bc326a3e8f834ed1674b
parent 617328b4a575b1c37dbc1ab6e5991f433bd452a4
parent dbf69e4652d439892080dff3353b1cfd5b4bf6bc

Merge "Exclude delay animation from getChildAnimations() list"

core/java/android/animation/AnimatorSet.java

diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 5480193..1065ed8 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -228,7 +228,9 @@
         int size = mNodes.size();
         for (int i = 0; i < size; i++) {
             Node node = mNodes.get(i);
-            childList.add(node.mAnimation);
+            if (node != mRootNode) {
+                childList.add(node.mAnimation);
+            }
         }
         return childList;
     }