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

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

Merge "Fix issue with xml GradientDrawables consuming both resources and... 

Merge "Fix issue with xml GradientDrawables consuming both resources and parameters provided by the Theme leading to array size mismatch exceptions being thrown."
parents 390de008 65add402

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

+26 −5
Original line number Diff line number Diff line
@@ -1571,15 +1571,32 @@ public class GradientDrawable extends Drawable { 
        st.mGradient = a.getInt(

                R.styleable.GradientDrawableGradient_type, st.mGradient);



        // TODO: Update these to be themeable.

        final boolean hasGradientColors = st.mGradientColors != null;

        final boolean hasGradientCenter = st.hasCenterColor();

        final int prevStart = hasGradientColors ? st.mGradientColors[0] : 0;

        final int prevCenter = hasGradientCenter ? st.mGradientColors[1] : 0;

        final int prevEnd;



        if (st.hasCenterColor()) {

            // if there is a center color, the end color is the last of the 3 values

            prevEnd = st.mGradientColors[2];

        } else if (hasGradientColors) {

            // if there is not a center color but there are already colors configured, then

            // the end color is the 2nd value in the array

            prevEnd = st.mGradientColors[1];

        } else {

            // otherwise, there isn't a previously configured end color

            prevEnd = 0;

        }



        final int startColor = a.getColor(

                R.styleable.GradientDrawableGradient_startColor, 0);

                R.styleable.GradientDrawableGradient_startColor, prevStart);

        final boolean hasCenterColor = a.hasValue(

                R.styleable.GradientDrawableGradient_centerColor);

                R.styleable.GradientDrawableGradient_centerColor) || hasGradientCenter;

        final int centerColor = a.getColor(

                R.styleable.GradientDrawableGradient_centerColor, 0);

                R.styleable.GradientDrawableGradient_centerColor, prevCenter);

        final int endColor = a.getColor(

                R.styleable.GradientDrawableGradient_endColor, 0);

                R.styleable.GradientDrawableGradient_endColor, prevEnd);



        if (hasCenterColor) {

            st.mGradientColors = new int[3];
@@ -1943,6 +1960,10 @@ public class GradientDrawable extends Drawable { 
            }

        }



        public boolean hasCenterColor() {

            return mGradientColors != null && mGradientColors.length == 3;

        }



        private void applyDensityScaling(int sourceDensity, int targetDensity) {

            if (mInnerRadius > 0) {

                mInnerRadius = Drawable.scaleFromDensity(