summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNader Jawad <njawad@google.com>2019-12-16 23:32:29 +0000
committerNader Jawad <njawad@google.com>2019-12-17 01:08:20 +0000
commit913dd6b9a9f43d21c5d2baa39a2bcd2239252b17 (patch)
tree554604f18b3a15bab26a8c19acc7730138949a82 /graphics
parent960a8cf90a091f37007f691a15a2ddead46a12ae (diff)
Revert submission
Reason for revert: Causes regressions tracked in: b/145900622 b/145864909 b/145948923 Change-Id: Ia24ece94d5281cd25d990d8cae923cf50497e1f1
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);