Merge "Merge "Prevent conflicting animations from starting." into rvc-dev am:... (ca952ac1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -879,7 +879,7 @@ public class BubbleStackView extends FrameLayout
		}
		}

		return false;
		return true;
		});
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -767,6 +767,10 @@ public class PhysicsAnimationLayout extends FrameLayout {
		int targetAnimDuration,
		TimeInterpolator targetAnimInterpolator,
		Runnable... pathAnimEndActions) {
		if (mPathAnimator != null) {
		mPathAnimator.cancel();
		}

		mPathAnimator = ObjectAnimator.ofFloat(
		this, mCurrentPointOnPathXProperty, mCurrentPointOnPathYProperty, path);

+5 −1

Original line number	Diff line number	Diff line
		@@ -459,6 +459,10 @@ public class StackAnimationController extends
		float friction,
		SpringForce spring,
		Float finalPosition) {
		if (!isActiveController()) {
		return;
		}

		Log.d(TAG, String.format("Flinging %s.",
		PhysicsAnimationLayout.getReadablePropertyName(property)));

		@@ -679,7 +683,7 @@ public class StackAnimationController extends
		DynamicAnimation.ViewProperty property, SpringForce spring,
		float vel, float finalPosition, @Nullable Runnable... after) {

		if (mLayout.getChildCount() == 0) {
		if (mLayout.getChildCount() == 0 \|\| !isActiveController()) {
		return;
		}