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

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

Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev

parents 624dd5ce 2efbe981

core/res/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -4911,7 +4911,7 @@ 
        <!-- Y coordinate of the origin of the gradient within the shape. -->

        <attr name="centerY" format="float|fraction" />

        <!-- Radius of the gradient, used only with radial gradient. -->

        <attr name="gradientRadius" format="float|fraction" />

        <attr name="gradientRadius" format="float|fraction|dimension" />

    </declare-styleable>



    <!-- Used to fill the shape of GradientDrawable with a solid color. -->

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

+4 −1
Original line number Diff line number Diff line
@@ -1395,9 +1395,12 @@ public class GradientDrawable extends Drawable { 
                    } else {

                        radiusType = RADIUS_TYPE_FRACTION;

                    }

                } else {

                } else if (tv.type == TypedValue.TYPE_DIMENSION) {

                    radius = tv.getDimension(r.getDisplayMetrics());

                    radiusType = RADIUS_TYPE_PIXELS;

                } else {

                    radius = tv.getFloat();

                    radiusType = RADIUS_TYPE_PIXELS;

                }



                st.mGradientRadius = radius;