From 672e7440f9586cd6ab276cd9e8295e3028f73253 Mon Sep 17 00:00:00 2001
From: conradchen <conradchen@google.com>
Date: Tue, 21 Dec 2021 11:33:53 -0500
Subject: [PATCH] [M3][Dialog] Fix dialog paddings

We missed to include top/bottom insets of button styles into dialog action margin calculation. Also the paddings between titles and messages were not correct.

PiperOrigin-RevId: 417626927
---
 .../google/android/material/button/res/values/dimens.xml  | 8 ++++++++
 .../dialog/res/layout/m3_alert_dialog_actions.xml         | 4 ++--
 .../google/android/material/dialog/res/values/dimens.xml  | 7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/java/com/google/android/material/button/res/values/dimens.xml b/lib/java/com/google/android/material/button/res/values/dimens.xml
index b7806bf68c7..e2d2323e937 100644
--- a/lib/java/com/google/android/material/button/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/button/res/values/dimens.xml
@@ -52,13 +52,21 @@
 
   <dimen name="mtrl_btn_snackbar_margin_horizontal">8dp</dimen>
 
+
+  <!-- LINT.IfChange -->
   <dimen name="m3_btn_inset">4dp</dimen>
+  <!-- LINT.ThenChange(../../../dialog/res/values/dimens.xml) -->
+
   <dimen name="m3_btn_max_width">320dp</dimen>
   <dimen name="m3_btn_stroke_size">1dp</dimen>
   <dimen name="m3_btn_padding_left">24dp</dimen>
   <dimen name="m3_btn_padding_right">24dp</dimen>
+
+  <!-- LINT.IfChange -->
   <dimen name="m3_btn_padding_top">6dp</dimen>
   <dimen name="m3_btn_padding_bottom">6dp</dimen>
+  <!-- LINT.ThenChange(../../../dialog/res/values/dimens.xml) -->
+
   <dimen name="m3_btn_elevation">0dp</dimen>
   <dimen name="m3_btn_elevated_btn_elevation">1dp</dimen>
   <dimen name="m3_btn_icon_btn_padding_left">16dp</dimen>
diff --git a/lib/java/com/google/android/material/dialog/res/layout/m3_alert_dialog_actions.xml b/lib/java/com/google/android/material/dialog/res/layout/m3_alert_dialog_actions.xml
index a65b574fd4d..42541abccb2 100644
--- a/lib/java/com/google/android/material/dialog/res/layout/m3_alert_dialog_actions.xml
+++ b/lib/java/com/google/android/material/dialog/res/layout/m3_alert_dialog_actions.xml
@@ -31,8 +31,8 @@
       android:orientation="horizontal"
       android:paddingLeft="?attr/dialogPreferredPadding"
       android:paddingRight="?attr/dialogPreferredPadding"
-      android:paddingTop="18dp"
-      android:paddingBottom="18dp">
+      android:paddingTop="@dimen/m3_alert_dialog_action_top_padding"
+      android:paddingBottom="@dimen/m3_alert_dialog_action_bottom_padding">
 
     <Button
         android:id="@android:id/button3"
diff --git a/lib/java/com/google/android/material/dialog/res/values/dimens.xml b/lib/java/com/google/android/material/dialog/res/values/dimens.xml
index 44562ccb6fd..517c1a72c70 100644
--- a/lib/java/com/google/android/material/dialog/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/dimens.xml
@@ -27,5 +27,10 @@
   <dimen name="m3_alert_dialog_corner_size">28dp</dimen>
   <dimen name="m3_alert_dialog_icon_size">24dp</dimen>
   <dimen name="m3_alert_dialog_icon_margin">16dp</dimen>
-  <dimen name="m3_alert_dialog_title_bottom_margin">10dp</dimen>
+  <dimen name="m3_alert_dialog_title_bottom_margin">16dp</dimen>
+
+  <!-- equals 24dp - @dimen/m3_btn_padding_top (6dp) - @dimen/m3_btn_inset (4dp) -->
+  <dimen name="m3_alert_dialog_action_top_padding">14dp</dimen>
+  <!-- equals 24dp - @dimen/m3_btn_padding_bottom (6dp) - @dimen/m3_btn_inset (4dp) -->
+  <dimen name="m3_alert_dialog_action_bottom_padding">14dp</dimen>
 </resources>