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

Commit d232e636 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved... 

am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev

* commit '0f1a3972':
  Stash modulation alpha until ColorStateList has resolved base color
parents ad8aa59f 0f1a3972

core/java/android/content/res/ColorStateList.java

+23 −4
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ public class ColorStateList implements Parcelable { 
            final TypedArray a = Resources.obtainAttributes(r, theme, attrs,

                    R.styleable.ColorStateListItem);

            final int[] themeAttrs = a.extractThemeAttrs();

            final int baseColor = a.getColor(R.styleable.ColorStateListItem_color, 0);

            final int baseColor = a.getColor(R.styleable.ColorStateListItem_color, Color.MAGENTA);

            final float alphaMod = a.getFloat(R.styleable.ColorStateListItem_alpha, 1.0f);



            changingConfigurations |= a.getChangingConfigurations();
@@ -296,7 +296,9 @@ public class ColorStateList implements Parcelable { 
            }

            stateSpec = StateSet.trimStateSet(stateSpec, j);



            // Apply alpha modulation.

            // Apply alpha modulation. If we couldn't resolve the color or

            // alpha yet, the default values leave us enough information to

            // modulate again during applyTheme().

            final int color = modulateColorAlpha(baseColor, alphaMod);

            if (listSize == 0 || stateSpec.length == 0) {

                defaultColor = color;
@@ -365,14 +367,31 @@ public class ColorStateList implements Parcelable { 
            if (themeAttrsList[i] != null) {

                final TypedArray a = t.resolveAttributes(themeAttrsList[i],

                        R.styleable.ColorStateListItem);



                final float defaultAlphaMod;

                if (themeAttrsList[i][R.styleable.ColorStateListItem_color] != 0) {

                    // If the base color hasn't been resolved yet, the current

                    // color's alpha channel is either full-opacity (if we

                    // haven't resolved the alpha modulation yet) or

                    // pre-modulated. Either is okay as a default value.

                    defaultAlphaMod = Color.alpha(mColors[i]) / 255.0f;

                } else {

                    // Otherwise, the only correct default value is 1. Even if

                    // nothing is resolved during this call, we can apply this

                    // multiple times without losing of information.

                    defaultAlphaMod = 1.0f;

                }



                final int baseColor = a.getColor(

                        R.styleable.ColorStateListItem_color, mColors[i]);

                final float alphaMod = a.getFloat(

                        R.styleable.ColorStateListItem_alpha, 1.0f);



                        R.styleable.ColorStateListItem_alpha, defaultAlphaMod);

                mColors[i] = modulateColorAlpha(baseColor, alphaMod);



                // Account for any configuration changes.

                mChangingConfigurations |= a.getChangingConfigurations();



                // Extract the theme attributes, if any.

                themeAttrsList[i] = a.extractThemeAttrs(themeAttrsList[i]);

                if (themeAttrsList[i] != null) {

                    hasUnresolvedAttrs = true;