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

Commit a6c2b5e2 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Fix stroke color in GradientState.initializeWithState()"

parents 76a0e3bf 083f5518

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

+8 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,14 @@ public class GradientDrawable extends Drawable { 
            mStrokePaint = new Paint(Paint.ANTI_ALIAS_FLAG);

            mStrokePaint.setStyle(Paint.Style.STROKE);

            mStrokePaint.setStrokeWidth(state.mStrokeWidth);

            if (state.mStrokeColorStateList != null) {

                final int[] currentState = getState();

                final int strokeStateColor = state.mStrokeColorStateList.getColorForState(

                        currentState, 0);

                mStrokePaint.setColor(strokeStateColor);

            } else {

                mStrokePaint.setColor(state.mStrokeColor);

            }



            if (state.mStrokeDashWidth != 0.0f) {

                DashPathEffect e = new DashPathEffect(