Merge "Exclude DelayAnim in child animation value setup" (36aabe85) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimatorSet.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -415,7 +415,8 @@ public final class AnimatorSet extends Animator {
		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,18 +513,22 @@ public final class AnimatorSet extends Animator {
		int size = mNodes.size();
		for (int i = 0; i < size; i++) {
		Node node = mNodes.get(i);
		if (node != mRootNode) {
		node.mAnimation.setupStartValues();
		}
		}
		}

		@Override
		public void setupEndValues() {
		int size = mNodes.size();
		for (int i = 0; i < size; i++) {
		Node node = mNodes.get(i);
		if (node != mRootNode) {
		node.mAnimation.setupEndValues();
		}
		}
		}

		@Override
		public void pause() {
		@@ -536,11 +541,13 @@ public final class AnimatorSet extends Animator {
		int size = mNodes.size();
		for (int i = 0; i < size; i++) {
		Node node = mNodes.get(i);
		if (node != mRootNode) {
		node.mAnimation.pause();
		}
		}
		}
		}
		}

		@Override
		public void resume() {
		@@ -553,11 +560,13 @@ public final class AnimatorSet extends Animator {
		int size = mNodes.size();
		for (int i = 0; i < size; i++) {
		Node node = mNodes.get(i);
		if (node != mRootNode) {
		node.mAnimation.resume();
		}
		}
		}
		}
		}

		/**
		* {@inheritDoc}