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

Updated GradientDrawable setColor(ColorStateList) implementation to

Browse Source 
match corresponding documentation to fall back to
setColor(Color.TRANSPARENT) in the event that null is passed as the
ColorStateList parameter

Refactored implementation to directly call setColor(Color.TRANSPARENT)
if setColor(null) is invoked, otherwise configure the solid colors and
the fill Paint color to the ColorStateList and resolved color for the
given state

Bug: 64951083
Test: Compiled, flashed an updated build of master onto taimen and
re-ran tests with updated implementation in GradientDrawableTest

Change-Id: Ia7e9a995fc78e49d601931ca6af81470d90f8439
This commit is contained in:
Nader Jawad
2018-04-04 14:45:43 -07:00
parent 27cc5aa2fd
commit 14516dba62
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -930,16 +930,15 @@ public class GradientDrawable extends Drawable {
* @see #getColor
*/
public void setColor(@Nullable ColorStateList colorStateList) {
mGradientState.setSolidColors(colorStateList);
final int color;
if (colorStateList == null) {
color = Color.TRANSPARENT;
setColor(Color.TRANSPARENT);
} else {
final int[] stateSet = getState();
color = colorStateList.getColorForState(stateSet, 0);
final int color = colorStateList.getColorForState(stateSet, 0);
mGradientState.setSolidColors(colorStateList);
mFillPaint.setColor(color);
invalidateSelf();
}
mFillPaint.setColor(color);
invalidateSelf();
}
/**