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

Commit 71b2fbde authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix null paint in GradientDrawable, make default values explicit

BUG: 15237001
Change-Id: I80844919b910163ed986257efb4b6f8fb62eaf6a
parent c6c967b6
Loading
Loading
Loading
Loading
+10 −8
Original line number Diff line number Diff line
@@ -612,7 +612,9 @@ public class GradientDrawable extends Drawable {
            case LINE: {
                RectF r = mRect;
                float y = r.centerY();
                if (haveStroke) {
                    canvas.drawLine(r.left, y, r.right, y, mStrokePaint);
                }
                break;
            }
            case RING:
@@ -1431,7 +1433,7 @@ public class GradientDrawable extends Drawable {
        public int mChangingConfigurations;
        public int mShape = RECTANGLE;
        public int mGradient = LINEAR_GRADIENT;
        public int mAngle;
        public int mAngle = 0;
        public Orientation mOrientation;
        public ColorStateList mColorStateList;
        public ColorStateList mStrokeColorStateList;
@@ -1440,11 +1442,11 @@ public class GradientDrawable extends Drawable {
        public float[] mTempPositions; // no need to copy
        public float[] mPositions;
        public int mStrokeWidth = -1; // if >= 0 use stroking.
        public float mStrokeDashWidth;
        public float mStrokeDashGap;
        public float mRadius;    // use this if mRadiusArray is null
        public float[] mRadiusArray;
        public Rect mPadding;
        public float mStrokeDashWidth = 0.0f;
        public float mStrokeDashGap = 0.0f;
        public float mRadius = 0.0f; // use this if mRadiusArray is null
        public float[] mRadiusArray = null;
        public Rect mPadding = null;
        public int mWidth = -1;
        public int mHeight = -1;
        public float mInnerRadiusRatio = DEFAULT_INNER_RADIUS_RATIO;