Merge "Put starting the animation back inside state changed check" into sc-dev (7395d119) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/RippleDrawable.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -331,7 +331,6 @@ public class RippleDrawable extends LayerDrawable {
	private void setRippleActive(boolean active) {		private void setRippleActive(boolean active) {
	if (mRippleActive != active) {		if (mRippleActive != active) {
	mRippleActive = active;		mRippleActive = active;
	}
	if (mState.mRippleStyle == STYLE_SOLID) {		if (mState.mRippleStyle == STYLE_SOLID) {
	if (active) {		if (active) {
	tryRippleEnter();		tryRippleEnter();
	@@ -346,6 +345,7 @@ public class RippleDrawable extends LayerDrawable {
	}		}
	}		}
	}		}
			}

	private void setBackgroundActive(boolean hovered, boolean focused, boolean pressed) {		private void setBackgroundActive(boolean hovered, boolean focused, boolean pressed) {
	if (mState.mRippleStyle == STYLE_SOLID) {		if (mState.mRippleStyle == STYLE_SOLID) {