From e3eb8ec0b780ef2603917a1c8d8ade55658755bb Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 27 Mar 2014 15:21:11 -0700 Subject: Allow a null tint in TouchFeedbackDrawable This ensures we won't crash if a Quantum drawable is inflated in a Holo theme, but it won't look correct, so don't do that. BUG: 13677025 Change-Id: I30cbff36bf3746543240d4c96cc57776874566d8 --- .../graphics/drawable/TouchFeedbackDrawable.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java index b66d86d..64de95f 100644 --- a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java +++ b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java @@ -39,7 +39,6 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import java.util.ArrayList; /** * Documentation pending. @@ -98,7 +97,7 @@ public class TouchFeedbackDrawable extends LayerDrawable { protected boolean onStateChange(int[] stateSet) { super.onStateChange(stateSet); - if (mRipplePaint != null) { + if (mRipplePaint != null && mState.mTint != null) { final ColorStateList stateList = mState.mTint; final int newColor = stateList.getColorForState(stateSet, 0); final int oldColor = mRipplePaint.getColor(); @@ -122,7 +121,7 @@ public class TouchFeedbackDrawable extends LayerDrawable { @Override public boolean isStateful() { - return super.isStateful() || mState.mTint.isStateful(); + return super.isStateful() || mState.mTint != null && mState.mTint.isStateful(); } @Override @@ -150,10 +149,6 @@ public class TouchFeedbackDrawable extends LayerDrawable { if (themeAttrs == null || themeAttrs[R.styleable.TouchFeedbackDrawable_tint] == 0) { mState.mTint = a.getColorStateList(R.styleable.TouchFeedbackDrawable_tint); - - if (mState.mTint == null) { - throw new RuntimeException(" tag requires a 'tint' attribute"); - } } if (themeAttrs == null || themeAttrs[R.styleable.TouchFeedbackDrawable_tintMode] == 0) { @@ -400,9 +395,11 @@ public class TouchFeedbackDrawable extends LayerDrawable { if (mRipplePaint == null) { mRipplePaint = new Paint(); mRipplePaint.setAntiAlias(true); - - final int color = mState.mTint.getColorForState(getState(), Color.TRANSPARENT); - mRipplePaint.setColor(color); + + if (mState.mTint != null) { + final int color = mState.mTint.getColorForState(getState(), Color.TRANSPARENT); + mRipplePaint.setColor(color); + } } return mRipplePaint; } -- cgit v1.1