Merge "Clear ripple animations on cancel/end" into lmp-dev (680e4255) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/Ripple.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -419,18 +419,22 @@ class Ripple {
	private void endSoftwareAnimations() {		private void endSoftwareAnimations() {
	if (mAnimRadius != null) {		if (mAnimRadius != null) {
	mAnimRadius.end();		mAnimRadius.end();
			mAnimRadius = null;
	}		}

	if (mAnimOpacity != null) {		if (mAnimOpacity != null) {
	mAnimOpacity.end();		mAnimOpacity.end();
			mAnimOpacity = null;
	}		}

	if (mAnimX != null) {		if (mAnimX != null) {
	mAnimX.end();		mAnimX.end();
			mAnimX = null;
	}		}

	if (mAnimY != null) {		if (mAnimY != null) {
	mAnimY.end();		mAnimY.end();
			mAnimY = null;
	}		}
	}		}

	@@ -506,18 +510,22 @@ class Ripple {
	private void cancelSoftwareAnimations() {		private void cancelSoftwareAnimations() {
	if (mAnimRadius != null) {		if (mAnimRadius != null) {
	mAnimRadius.cancel();		mAnimRadius.cancel();
			mAnimRadius = null;
	}		}

	if (mAnimOpacity != null) {		if (mAnimOpacity != null) {
	mAnimOpacity.cancel();		mAnimOpacity.cancel();
			mAnimOpacity = null;
	}		}

	if (mAnimX != null) {		if (mAnimX != null) {
	mAnimX.cancel();		mAnimX.cancel();
			mAnimX = null;
	}		}

	if (mAnimY != null) {		if (mAnimY != null) {
	mAnimY.cancel();		mAnimY.cancel();
			mAnimY = null;
	}		}
	}		}

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -326,6 +326,7 @@ class RippleBackground {
	private void endSoftwareAnimations() {		private void endSoftwareAnimations() {
	if (mAnimOuterOpacity != null) {		if (mAnimOuterOpacity != null) {
	mAnimOuterOpacity.end();		mAnimOuterOpacity.end();
			mAnimOuterOpacity = null;
	}		}
	}		}

	@@ -413,6 +414,7 @@ class RippleBackground {
	private void cancelSoftwareAnimations() {		private void cancelSoftwareAnimations() {
	if (mAnimOuterOpacity != null) {		if (mAnimOuterOpacity != null) {
	mAnimOuterOpacity.cancel();		mAnimOuterOpacity.cancel();
			mAnimOuterOpacity = null;
	}		}
	}		}