Skip to content

Commit 672e744

Browse files
drchenleticiarossi
authored andcommitted
[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
1 parent 2ae3ca4 commit 672e744

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

lib/java/com/google/android/material/button/res/values/dimens.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,21 @@
5252

5353
<dimen name="mtrl_btn_snackbar_margin_horizontal">8dp</dimen>
5454

55+
56+
<!-- LINT.IfChange -->
5557
<dimen name="m3_btn_inset">4dp</dimen>
58+
<!-- LINT.ThenChange(../../../dialog/res/values/dimens.xml) -->
59+
5660
<dimen name="m3_btn_max_width">320dp</dimen>
5761
<dimen name="m3_btn_stroke_size">1dp</dimen>
5862
<dimen name="m3_btn_padding_left">24dp</dimen>
5963
<dimen name="m3_btn_padding_right">24dp</dimen>
64+
65+
<!-- LINT.IfChange -->
6066
<dimen name="m3_btn_padding_top">6dp</dimen>
6167
<dimen name="m3_btn_padding_bottom">6dp</dimen>
68+
<!-- LINT.ThenChange(../../../dialog/res/values/dimens.xml) -->
69+
6270
<dimen name="m3_btn_elevation">0dp</dimen>
6371
<dimen name="m3_btn_elevated_btn_elevation">1dp</dimen>
6472
<dimen name="m3_btn_icon_btn_padding_left">16dp</dimen>

lib/java/com/google/android/material/dialog/res/layout/m3_alert_dialog_actions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
android:orientation="horizontal"
3232
android:paddingLeft="?attr/dialogPreferredPadding"
3333
android:paddingRight="?attr/dialogPreferredPadding"
34-
android:paddingTop="18dp"
35-
android:paddingBottom="18dp">
34+
android:paddingTop="@dimen/m3_alert_dialog_action_top_padding"
35+
android:paddingBottom="@dimen/m3_alert_dialog_action_bottom_padding">
3636

3737
<Button
3838
android:id="@android:id/button3"

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,10 @@
2727
<dimen name="m3_alert_dialog_corner_size">28dp</dimen>
2828
<dimen name="m3_alert_dialog_icon_size">24dp</dimen>
2929
<dimen name="m3_alert_dialog_icon_margin">16dp</dimen>
30-
<dimen name="m3_alert_dialog_title_bottom_margin">10dp</dimen>
30+
<dimen name="m3_alert_dialog_title_bottom_margin">16dp</dimen>
31+
32+
<!-- equals 24dp - @dimen/m3_btn_padding_top (6dp) - @dimen/m3_btn_inset (4dp) -->
33+
<dimen name="m3_alert_dialog_action_top_padding">14dp</dimen>
34+
<!-- equals 24dp - @dimen/m3_btn_padding_bottom (6dp) - @dimen/m3_btn_inset (4dp) -->
35+
<dimen name="m3_alert_dialog_action_bottom_padding">14dp</dimen>
3136
</resources>

0 commit comments

Comments
 (0)