Automated g4 rollback of changelist 522443049

PiperOrigin-RevId: 523143316

Author: Material Design Team

docs/components/Dialog.md

@@ -120,7 +120,7 @@ particular type), a background scrim, and, optionally, title and buttons.
 
 Element                             | **Attribute**                                            | **Related methods**                                    | **Default value**
 ----------------------------------- | -------------------------------------------------------- | ------------------------------------------------------ | -----------------
-**Color**                           | `app:backgroundTint`                                     | N/A                                                    | `?attr/colorSurface`
+**Color**                           | N/A                                                      | N/A                                                    | `?attr/colorSurface`
 **Shape**                           | `app:shapeAppearance`<br/>`app:shapeAppearanceOverlay`   | N/A                                                    | `?attr/shapeAppearanceMediumComponent` with a corner size of `28dp`
 **Background inset start and end**  | `app:backgroundInsetStart`<br/>`app:backgroundInsetEnd`  | `setBackgroundInsetStart`<br/>`setBackgroundInsetEnd`  | `24dp`
 **Background inset top and bottom** | `app:backgroundInsetTop`<br/>`app:backgroundInsetBottom` | `setBackgroundInsetTop`<br/>`setBackgroundInsetBottom` | `80dp`

lib/java/com/google/android/material/dialog/MaterialAlertDialogBuilder.java

@@ -28,7 +28,6 @@
 import android.content.DialogInterface.OnMultiChoiceClickListener;
 import android.content.res.ColorStateList;
 import android.content.res.Resources.Theme;
-import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -42,6 +41,7 @@
 import android.widget.ListAdapter;
 import androidx.annotation.ArrayRes;
 import androidx.annotation.AttrRes;
+import androidx.annotation.Dimension;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -50,6 +50,7 @@
 import androidx.annotation.StyleRes;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.core.view.ViewCompat;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.resources.MaterialAttributes;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -73,7 +74,7 @@ public class MaterialAlertDialogBuilder extends AlertDialog.Builder {
   private static final int MATERIAL_ALERT_DIALOG_THEME_OVERLAY = R.attr.materialAlertDialogTheme;
 
   @Nullable private Drawable background;
-  @NonNull private final Rect backgroundInsets;
+  @NonNull @Dimension private final Rect backgroundInsets;
 
   private static int getMaterialAlertDialogThemeOverlay(@NonNull Context context) {
     TypedValue materialAlertDialogThemeOverlay =
@@ -116,16 +117,12 @@ public MaterialAlertDialogBuilder(@NonNull Context context, int overrideThemeRes
     backgroundInsets =
         MaterialDialogs.getDialogBackgroundInsets(context, DEF_STYLE_ATTR, DEF_STYLE_RES);
 
-    TypedArray a =
-        context.obtainStyledAttributes(
-            /* set= */ null, R.styleable.MaterialAlertDialog, DEF_STYLE_ATTR, DEF_STYLE_RES);
-    int backgroundColor = a.getColor(R.styleable.MaterialAlertDialog_backgroundTint, 0);
-    a.recycle();
-
+    int surfaceColor =
+        MaterialColors.getColor(context, R.attr.colorSurface, getClass().getCanonicalName());
     MaterialShapeDrawable materialShapeDrawable =
         new MaterialShapeDrawable(context, null, DEF_STYLE_ATTR, DEF_STYLE_RES);
     materialShapeDrawable.initializeElevationOverlay(context);
-    materialShapeDrawable.setFillColor(ColorStateList.valueOf(backgroundColor));
+    materialShapeDrawable.setFillColor(ColorStateList.valueOf(surfaceColor));
 
     // dialogCornerRadius first appeared in Android Pie
     if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {

lib/java/com/google/android/material/dialog/res/values/attrs.xml

@@ -29,7 +29,6 @@
   </declare-styleable>
 
   <declare-styleable name="MaterialAlertDialog">
-    <attr name="backgroundTint"/>
     <attr name="backgroundInsetStart" format="dimension"/>
     <attr name="backgroundInsetTop" format="dimension"/>
     <attr name="backgroundInsetEnd" format="dimension"/>

lib/java/com/google/android/material/dialog/res/values/styles.xml

@@ -27,7 +27,6 @@
   </style>
 
   <style name="MaterialAlertDialog.MaterialComponents" parent="AlertDialog.AppCompat">
-    <item name="backgroundTint">?attr/colorSurface</item>
     <item name="android:layout">@layout/mtrl_alert_dialog</item>
     <item name="listItemLayout">@layout/mtrl_alert_select_dialog_item</item>
     <item name="multiChoiceItemLayout">@layout/mtrl_alert_select_dialog_multichoice</item>
@@ -112,7 +111,6 @@
   </style>
 
   <style name="MaterialAlertDialog.Material3" parent="MaterialAlertDialog.MaterialComponents">
-    <item name="backgroundTint">@macro/m3_comp_dialog_container_color</item>
     <item name="enforceMaterialTheme">true</item>
     <item name="android:layout">@layout/m3_alert_dialog</item>
     <item name="shapeAppearance">@macro/m3_comp_dialog_container_shape</item>

lib/java/com/google/android/material/dialog/res/values/tokens.xml

@@ -21,7 +21,6 @@
 
   <!-- Generated from token set (md.comp.dialog) in context (platform=android, audience=3p). -->
   <!-- Enabled - Container -->
-  <macro name="m3_comp_dialog_container_color">?attr/colorSurface</macro>
   <macro name="m3_comp_dialog_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
   <!-- Enabled - Headline -->
   <macro name="m3_comp_dialog_headline_type">?attr/textAppearanceHeadlineSmall</macro>