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

Handle null argument to GradientDrawable.setColor() and setStroke()

Browse Source 
BUG: 11966834
Change-Id: I5d17bd846b95eceaa7aa1dff64a3e6886f7e6539
This commit is contained in:
Alan Viverette
2013-12-02 19:30:51 -08:00
parent 8af04d8b85
commit 7c263c6ee7
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -288,11 +288,15 @@ public class GradientDrawable extends Drawable {
*/
public void setStroke(
int width, ColorStateList colorStateList, float dashWidth, float dashGap) {
mGradientState.setStroke(width, colorStateList, dashWidth, dashGap);
if (colorStateList == null) {
setStroke(width, Color.TRANSPARENT, dashWidth, dashGap);
} else {
mGradientState.setStroke(width, colorStateList, dashWidth, dashGap);
final int[] stateSet = getState();
final int color = colorStateList.getColorForState(stateSet, 0);
setStrokeInternal(width, color, dashWidth, dashGap);
final int[] stateSet = getState();
final int color = colorStateList.getColorForState(stateSet, 0);
setStrokeInternal(width, color, dashWidth, dashGap);
}
}
private void setStrokeInternal(int width, int color, float dashWidth, float dashGap) {
@@ -675,7 +679,9 @@ public class GradientDrawable extends Drawable {
/**
* Changes this drawable to use a single color state list instead of a
* gradient.
* gradient. Calling this method with a null argument will clear the color
* and is equivalent to calling {@link #setColor(int)} with the argument
* {@link Color#TRANSPARENT}.
* <p>
* <strong>Note</strong>: changing color will affect all instances of a
* drawable loaded from a resource. It is recommended to invoke
@@ -685,10 +691,14 @@ public class GradientDrawable extends Drawable {
* @see #mutate()
*/
public void setColor(ColorStateList colorStateList) {
final int color = colorStateList.getColorForState(getState(), 0);
mGradientState.setColorStateList(colorStateList);
mFillPaint.setColor(color);
invalidateSelf();
if (colorStateList == null) {
setColor(Color.TRANSPARENT);
} else {
final int color = colorStateList.getColorForState(getState(), 0);
mGradientState.setColorStateList(colorStateList);
mFillPaint.setColor(color);
invalidateSelf();
}
}
@Override
@@ -1295,7 +1305,7 @@ public class GradientDrawable extends Drawable {
}
public void setSolidColor(int argb) {
mHasSolidColor = true;
mHasSolidColor = argb != Color.TRANSPARENT;
mSolidColor = argb;
mColors = null;
mColorStateList = null;