summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-12-17 03:06:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-12-17 03:06:55 +0000
commitff4627bf4ca0a20eba9772122b68ac1fae482622 (patch)
tree292c99968b7fd502295c1613d36fde946f4c7056 /graphics
parenta73353e4d350b501edd581c04846abcf353476ee (diff)
parent913dd6b9a9f43d21c5d2baa39a2bcd2239252b17 (diff)
Merge "Revert submission"
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/GradientDrawable.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 45b2de5f4b31..c6586ecfceb9 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -784,9 +784,7 @@ public class GradientDrawable extends Drawable {
mFillPaint.setDither(st.mDither);
mFillPaint.setColorFilter(colorFilter);
if (colorFilter != null && st.mSolidColors == null) {
- // 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);
+ mFillPaint.setColor(mAlpha << 24);
}
if (haveStroke) {
mStrokePaint.setAlpha(currStrokeAlpha);