Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd300fc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed issue where tint would be applied to solid region of... 

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

graphics/java/android/graphics/drawable/GradientDrawable.java

+3 −1
Original line number Diff line number Diff line
@@ -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);