summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Doris Liu <tianliu@google.com> 2015-08-05 20:00:11 -0700
committer Doris Liu <tianliu@google.com> 2015-08-06 11:02:32 -0700
commitdbf69e4652d439892080dff3353b1cfd5b4bf6bc (patch)
treefd6fe06e35dd059d990621e3d4ecd491cd6faf4f
parent38b452073575c98d0adc673291ba67bb6787dffb (diff)
Exclude delay animation from getChildAnimations() list
Bug: 22975427 Change-Id: I8bd9a51f0a886873346d77e9452662301a7c0363
-rw-r--r--core/java/android/animation/AnimatorSet.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java
index 5480193a8c34..1065ed80e700 100644
--- a/core/java/android/animation/AnimatorSet.java
+++ b/core/java/android/animation/AnimatorSet.java
@@ -228,7 +228,9 @@ public final class AnimatorSet extends Animator {
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;
}