Skip to content

Commit dae89b7

Browse files
mtotschnigdsn5ft
authored andcommitted
[Dialog] Update DialogWhenLarge theme to have correct parent theme
Resolves #3402 Resolves #3400 Co-authored-by: imhappi GIT_ORIGIN_REV_ID=8aee44c6a45954096083b06540e5aa1058eff34b PiperOrigin-RevId: 534921469
1 parent 1fcde2c commit dae89b7

File tree

12 files changed

+33
-38
lines changed

12 files changed

+33
-38
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,14 @@
6666
<public name="Theme.Material3.Light.Dialog" type="style"/>
6767
<public name="Theme.Material3.Light.Dialog.Alert" type="style"/>
6868
<public name="Theme.Material3.Light.Dialog.MinWidth" type="style"/>
69-
<public name="Theme.Material3.Light.DialogWhenLarge" type="style"/>
7069

7170
<public name="Theme.Material3.Dark.Dialog" type="style"/>
7271
<public name="Theme.Material3.Dark.Dialog.Alert" type="style"/>
7372
<public name="Theme.Material3.Dark.Dialog.MinWidth" type="style"/>
74-
<public name="Theme.Material3.Dark.DialogWhenLarge" type="style"/>
7573

7674
<public name="Theme.Material3.DayNight.Dialog" type="style"/>
7775
<public name="Theme.Material3.DayNight.Dialog.Alert" type="style"/>
7876
<public name="Theme.Material3.DayNight.Dialog.MinWidth" type="style"/>
79-
<public name="Theme.Material3.DayNight.DialogWhenLarge" type="style"/>
8077

8178
<public name="ThemeOverlay.Material3.Dialog" type="style"/>
8279
<public name="ThemeOverlay.Material3.Dialog.Alert" type="style"/>

lib/java/com/google/android/material/dialog/res/values-large/themes_base.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

lib/java/com/google/android/material/dialog/res/values-night/themes_daynight.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<!-- Material 3 themes (day/night versions) for dialogs. -->
1919
<style name="Theme.Material3.DayNight.Dialog" parent="Theme.Material3.Dark.Dialog"/>
2020
<style name="Theme.Material3.DayNight.Dialog.Alert" parent="Theme.Material3.Dark.Dialog.Alert"/>
21-
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Dark.DialogWhenLarge"/>
2221
<style name="Theme.Material3.DayNight.Dialog.MinWidth" parent="Theme.Material3.Dark.Dialog.MinWidth"/>
2322

2423
<!-- Material themes (day/night versions) for dialogs. -->

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
"Base.Theme" theme.
6464
-->
6565

66-
<style name="Theme.Material3.Light.DialogWhenLarge" parent="Base.Theme.Material3.Light.Dialog"/>
67-
<style name="Theme.Material3.Dark.DialogWhenLarge" parent="Base.Theme.Material3.Dark.Dialog"/>
6866
<style name="Theme.Material3.Light.Dialog" parent="Base.Theme.Material3.Light.Dialog"/>
6967
<style name="Theme.Material3.Dark.Dialog" parent="Base.Theme.Material3.Dark.Dialog"/>
7068

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,20 @@
544544
<style name="Base.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog"/>
545545
<style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog"/>
546546

547+
<style name="Base.Theme.Material3.Light.Dialog.FixedSize">
548+
<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
549+
<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
550+
<item name="windowFixedHeightMajor">@dimen/abc_dialog_fixed_height_major</item>
551+
<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
552+
</style>
553+
554+
<style name="Base.Theme.Material3.Dark.Dialog.FixedSize">
555+
<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
556+
<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
557+
<item name="windowFixedHeightMajor">@dimen/abc_dialog_fixed_height_major</item>
558+
<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
559+
</style>
560+
547561
<style name="Base.V14.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge">
548562
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
549563

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<!-- Material 3 themes (day/night versions) for dialogs. -->
1919
<style name="Theme.Material3.DayNight.Dialog" parent="Theme.Material3.Light.Dialog"/>
2020
<style name="Theme.Material3.DayNight.Dialog.Alert" parent="Theme.Material3.Light.Dialog.Alert"/>
21-
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Light.DialogWhenLarge"/>
2221
<style name="Theme.Material3.DayNight.Dialog.MinWidth" parent="Theme.Material3.Light.Dialog.MinWidth"/>
2322

2423
<!-- Material themes (day/night versions) for dialogs. -->

lib/java/com/google/android/material/theme/res-public/values/public.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<public name="Theme.Material3.DynamicColors.Light" type="style"/>
2525
<public name="Theme.Material3.DynamicColors.Dark" type="style"/>
2626
<public name="Theme.Material3.DynamicColors.DayNight" type="style"/>
27+
<public name="Theme.Material3.Light.DialogWhenLarge" type="style"/>
28+
<public name="Theme.Material3.Dark.DialogWhenLarge" type="style"/>
29+
<public name="Theme.Material3.DayNight.DialogWhenLarge" type="style"/>
2730

2831
<public name="ThemeOverlay.Material3" type="style"/>
2932
<public name="ThemeOverlay.Material3.Light" type="style"/>

lib/java/com/google/android/material/theme/res/values-large/themes_base.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
-->
1717
<resources>
1818

19+
<style name="Base.Theme.Material3.Light.DialogWhenLarge"
20+
parent="Base.Theme.Material3.Light.Dialog.FixedSize"/>
21+
22+
<style name="Base.Theme.Material3.Dark.DialogWhenLarge"
23+
parent="Base.Theme.Material3.Dark.Dialog.FixedSize"/>
24+
1925
<style name="Base.Theme.MaterialComponents.DialogWhenLarge"
2026
parent="Base.Theme.MaterialComponents.Dialog.FixedSize"/>
2127

lib/java/com/google/android/material/theme/res/values-night/themes_daynight.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<style name="Theme.Material3.DayNight" parent="Theme.Material3.Dark"/>
2020
<style name="Theme.Material3.DayNight.NoActionBar" parent="Theme.Material3.Dark.NoActionBar"/>
2121
<style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Dark"/>
22+
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Dark.DialogWhenLarge"/>
2223

2324
<!-- Material themes (day/night versions) for activities. -->
2425
<style name="Theme.MaterialComponents.DayNight" parent="Theme.MaterialComponents"/>

lib/java/com/google/android/material/theme/res/values/themes.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444

4545
<style name="Theme.Material3.DynamicColors.Dark" parent="Theme.Material3.Dark"/>
4646

47+
<style name="Theme.Material3.Light.DialogWhenLarge" parent="Base.Theme.Material3.Light.DialogWhenLarge"/>
48+
49+
<style name="Theme.Material3.Dark.DialogWhenLarge" parent="Base.Theme.Material3.Dark.DialogWhenLarge"/>
50+
4751
<!--
4852
Themes in the "Theme.MaterialComponents" family will contain a default full color scheme.
4953

0 commit comments

Comments
 (0)