Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow a null tint in TouchFeedbackDrawable"

Browse Source
This commit is contained in:
Alan Viverette
2014-03-27 22:25:11 +00:00
committed by Android (Google) Code Review
parent 9eaf763aa8 e3eb8ec0b7
commit 433ee01236
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
View File

@@ -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("<touch-feedback> 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;
}