From 913dd6b9a9f43d21c5d2baa39a2bcd2239252b17 Mon Sep 17 00:00:00 2001
From: Nader Jawad <njawad@google.com>
Date: Mon, 16 Dec 2019 23:32:29 +0000
Subject: Revert submission

Reason for revert: Causes regressions tracked in:

b/145900622
b/145864909
b/145948923

Change-Id: Ia24ece94d5281cd25d990d8cae923cf50497e1f1
---
 graphics/java/android/graphics/drawable/GradientDrawable.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'graphics/java/android')

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);
-- 
cgit v1.2.3-59-g8ed1b