[Color] Fix MaterialColors cannot handle CSL issue

Resolves #955

PiperOrigin-RevId: 440358122

Author: drchen

lib/java/com/google/android/material/color/MaterialColors.java

@@ -28,6 +28,7 @@
 import androidx.annotation.FloatRange;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import com.google.android.material.resources.MaterialAttributes;
 
@@ -66,7 +67,9 @@ private MaterialColors() {
    */
   @ColorInt
   public static int getColor(@NonNull View view, @AttrRes int colorAttributeResId) {
-    return MaterialAttributes.resolveOrThrow(view, colorAttributeResId);
+    return resolveColor(
+        view.getContext(),
+        MaterialAttributes.resolveTypedValueOrThrow(view, colorAttributeResId));
   }
 
   /**
@@ -77,7 +80,10 @@ public static int getColor(@NonNull View view, @AttrRes int colorAttributeResId)
   @ColorInt
   public static int getColor(
       Context context, @AttrRes int colorAttributeResId, String errorMessageComponent) {
-    return MaterialAttributes.resolveOrThrow(context, colorAttributeResId, errorMessageComponent);
+    return resolveColor(
+        context,
+        MaterialAttributes.resolveTypedValueOrThrow(
+            context, colorAttributeResId, errorMessageComponent));
   }
 
   /**
@@ -99,12 +105,22 @@ public static int getColor(
       @NonNull Context context, @AttrRes int colorAttributeResId, @ColorInt int defaultValue) {
     TypedValue typedValue = MaterialAttributes.resolve(context, colorAttributeResId);
     if (typedValue != null) {
-      return typedValue.data;
+      return resolveColor(context, typedValue);
     } else {
       return defaultValue;
     }
   }
 
+  private static int resolveColor(@NonNull Context context, @NonNull TypedValue typedValue) {
+    if (typedValue.resourceId != 0) {
+      // Color State List
+      return ContextCompat.getColor(context, typedValue.resourceId);
+    } else {
+      // Color Int
+      return typedValue.data;
+    }
+  }
+
   /**
    * Convenience method that calculates {@link MaterialColors#layer(View, int, int, float)} without
    * an {@code overlayAlpha} value by passing in {@code 1f} for the alpha value.

lib/java/com/google/android/material/resources/MaterialAttributes.java

@@ -50,12 +50,15 @@ public static TypedValue resolve(@NonNull Context context, @AttrRes int attribut
     return null;
   }
 
-  /**
-   * Returns the {@link TypedValue} for the provided {@code attributeResId}.
-   *
-   * @throws IllegalArgumentException if the attribute is not present in the current theme.
-   */
-  public static int resolveOrThrow(
+  @NonNull
+  public static TypedValue resolveTypedValueOrThrow(
+      @NonNull View componentView, @AttrRes int attributeResId) {
+    return resolveTypedValueOrThrow(
+        componentView.getContext(), attributeResId, componentView.getClass().getCanonicalName());
+  }
+
+  @NonNull
+  public static TypedValue resolveTypedValueOrThrow(
       @NonNull Context context,
       @AttrRes int attributeResId,
       @NonNull String errorMessageComponent) {
@@ -71,7 +74,19 @@ public static int resolveOrThrow(
               errorMessageComponent,
               context.getResources().getResourceName(attributeResId)));
     }
-    return typedValue.data;
+    return typedValue;
+  }
+
+  /**
+   * Returns the {@link TypedValue} for the provided {@code attributeResId}.
+   *
+   * @throws IllegalArgumentException if the attribute is not present in the current theme.
+   */
+  public static int resolveOrThrow(
+      @NonNull Context context,
+      @AttrRes int attributeResId,
+      @NonNull String errorMessageComponent) {
+    return resolveTypedValueOrThrow(context, attributeResId, errorMessageComponent).data;
   }
 
   /**
@@ -80,9 +95,9 @@ public static int resolveOrThrow(
    *
    * @throws IllegalArgumentException if the attribute is not present in the current theme.
    */
-  public static int resolveOrThrow(@NonNull View componentView, @AttrRes int attributeResId) {
-    return resolveOrThrow(
-        componentView.getContext(), attributeResId, componentView.getClass().getCanonicalName());
+  public static int resolveOrThrow(
+      @NonNull View componentView, @AttrRes int attributeResId) {
+    return resolveTypedValueOrThrow(componentView, attributeResId).data;
   }
 
   /**