Merge "Fixed issue where tint would be applied to solid region of GradientDrawable even if none was defined"

This commit is contained in:
TreeHugger Robot
2019-10-31 22:39:44 +00:00
committed by Android (Google) Code Review

View File

@@ -784,7 +784,9 @@ public class GradientDrawable extends Drawable {
mFillPaint.setDither(st.mDither);
mFillPaint.setColorFilter(colorFilter);
if (colorFilter != null && st.mSolidColors == null) {
mFillPaint.setColor(mAlpha << 24);
// If we don't have a solid color and we don't have a gradient,
// the app is stroking the shape, set the color to transparent
mFillPaint.setColor(st.mGradientColors != null ? mAlpha << 24 : 0);
}
if (haveStroke) {
mStrokePaint.setAlpha(currStrokeAlpha);