Skip to content

Commit d8f6b33

Browse files
pubiqqpubiqq
committed
[Internal] Update naming of base styles
1 parent 2c2a26c commit d8f6b33

File tree

10 files changed

+64
-189
lines changed

10 files changed

+64
-189
lines changed

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,29 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Base.V14.Theme.Material3.Light.BottomSheetDialog" parent="Theme.Material3.Light.Dialog">
18+
<style name="Base.Theme.Material3.Light.BottomSheetDialog" parent="Theme.Material3.Light.Dialog">
1919
<item name="android:windowIsFloating">false</item>
2020
<item name="android:windowSoftInputMode">adjustResize</item>
2121
<item name="android:windowBackground">@android:color/transparent</item>
2222
<item name="android:windowAnimationStyle">@style/Animation.Material3.BottomSheetDialog</item>
2323
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
2424
</style>
2525

26-
<style name="Base.V14.Theme.Material3.Dark.BottomSheetDialog" parent="Theme.Material3.Dark.Dialog">
26+
<style name="Base.Theme.Material3.Dark.BottomSheetDialog" parent="Theme.Material3.Dark.Dialog">
2727
<item name="android:windowIsFloating">false</item>
2828
<item name="android:windowSoftInputMode">adjustResize</item>
2929
<item name="android:windowBackground">@android:color/transparent</item>
3030
<item name="android:windowAnimationStyle">@style/Animation.Material3.BottomSheetDialog</item>
3131
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
3232
</style>
3333

34-
<style name="Base.V14.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
34+
<style name="Base.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
35+
<item name="android:statusBarColor">@android:color/transparent</item>
3536
<item name="android:windowIsFloating">false</item>
3637
<item name="android:windowSoftInputMode">adjustResize</item>
3738
<item name="android:windowBackground">@android:color/transparent</item>
3839
<item name="android:windowAnimationStyle">@style/Animation.Material3.BottomSheetDialog</item>
3940
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
4041
<item name="enableEdgeToEdge">true</item>
4142
</style>
42-
43-
<style name="Base.V21.ThemeOverlay.Material3.BottomSheetDialog"
44-
parent="Base.V14.ThemeOverlay.Material3.BottomSheetDialog">
45-
<item name="android:statusBarColor">@android:color/transparent</item>
46-
</style>
47-
48-
<style name="Base.Theme.Material3.Light.BottomSheetDialog" parent="Base.V14.Theme.Material3.Light.BottomSheetDialog"/>
49-
<style name="Base.Theme.Material3.Dark.BottomSheetDialog" parent="Base.V14.Theme.Material3.Dark.BottomSheetDialog"/>
50-
<style name="Base.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.V21.ThemeOverlay.Material3.BottomSheetDialog"/>
5143
</resources>

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

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

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

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
-->
1717
<resources xmlns:tools="http://schemas.android.com/tools">
1818

19-
<!-- All new attributes should be set in the follow four Base.V14 themes. -->
20-
<eat-comment/>
21-
2219
<!-- Base themes of Theme.Material3Expressive themes for dialogs. -->
2320

2421
<style name="Base.Theme.Material3Expressive.Light.Dialog" parent="Theme.Material3.Light.Dialog">
@@ -77,7 +74,7 @@
7774

7875
<!-- Base themes of Theme.Material3 themes for dialogs. -->
7976

80-
<style name="Base.V14.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
77+
<style name="Base.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
8178
<item name="isMaterial3Theme">true</item>
8279

8380
<!-- Color palettes -->
@@ -166,6 +163,7 @@
166163
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
167164
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
168165
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
166+
<item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
169167
<item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
170168
<item name="extendedFloatingActionButtonStyle">?attr/extendedFloatingActionButtonPrimaryStyle</item>
171169
<item name="extendedFloatingActionButtonPrimaryStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Primary</item>
@@ -370,7 +368,7 @@
370368
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Light</item>
371369
</style>
372370

373-
<style name="Base.V14.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
371+
<style name="Base.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
374372
<item name="isMaterial3Theme">true</item>
375373

376374
<!-- Color palettes -->
@@ -459,6 +457,7 @@
459457
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
460458
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
461459
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
460+
<item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
462461
<item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
463462
<item name="extendedFloatingActionButtonStyle">?attr/extendedFloatingActionButtonPrimaryStyle</item>
464463
<item name="extendedFloatingActionButtonPrimaryStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Icon.Primary</item>
@@ -661,9 +660,6 @@
661660
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
662661
</style>
663662

664-
<style name="Base.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog"/>
665-
<style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog"/>
666-
667663
<style name="Base.Theme.Material3.Light.Dialog.FixedSize">
668664
<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
669665
<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
@@ -678,7 +674,15 @@
678674
<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
679675
</style>
680676

681-
<style name="Base.V14.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge">
677+
<!-- Themes in the "Base.Theme" family vary based on the current platform
678+
version to provide the correct basis on each device. You probably don't
679+
want to use them directly in your apps.
680+
681+
Themes in the "Theme.MaterialComponents" family are meant to be extended or used
682+
directly by apps. -->
683+
<eat-comment/>
684+
685+
<style name="Base.Theme.MaterialComponents.Dialog" parent="Base.Theme.MaterialComponents.Dialog.Bridge">
682686
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
683687

684688
<item name="colorPrimary">@color/design_dark_default_color_primary</item>
@@ -724,18 +728,15 @@
724728
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
725729

726730
<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
731+
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
727732
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
728733

729734
<!-- Type styles -->
730735
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
731736
<item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
732737
</style>
733738

734-
<style name="Base.V21.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog">
735-
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
736-
</style>
737-
738-
<style name="Base.V14.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge">
739+
<style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.Theme.MaterialComponents.Light.Dialog.Bridge">
739740
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
740741

741742
<!-- Colors -->
@@ -781,29 +782,14 @@
781782
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
782783

783784
<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
785+
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
784786
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
785787

786788
<!-- Type styles -->
787789
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
788790
<item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
789791
</style>
790792

791-
<style name="Base.V21.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog">
792-
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
793-
</style>
794-
795-
<!-- Themes in the "Base.Theme" family vary based on the current platform
796-
version to provide the correct basis on each device. You probably don't
797-
want to use them directly in your apps.
798-
799-
Themes in the "Theme.MaterialComponents" family are meant to be extended or used
800-
directly by apps. -->
801-
<eat-comment/>
802-
803-
<style name="Base.Theme.MaterialComponents.Dialog" parent="Base.V21.Theme.MaterialComponents.Dialog"/>
804-
805-
<style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.V21.Theme.MaterialComponents.Light.Dialog"/>
806-
807793
<style name="Base.Theme.MaterialComponents.Dialog.Alert">
808794
<item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
809795
<item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@
2727

2828
<style name="Platform.MaterialComponents.Light.Dialog" parent="Theme.AppCompat.Light.Dialog"/>
2929

30-
<!-- All new attributes should be set in the following four Base.V14 themes. -->
30+
<!-- Themes in the "Base.Theme" family vary based on the current platform
31+
version to provide the correct basis on each device. You probably don't
32+
want to use them directly in your apps.
33+
34+
Themes in the "Theme.MaterialComponents" family are meant to be extended or used
35+
directly by apps. -->
3136
<eat-comment/>
3237

33-
<style name="Base.V14.Theme.MaterialComponents.Dialog.Bridge" parent="Platform.MaterialComponents.Dialog">
38+
<style name="Base.Theme.MaterialComponents.Dialog.Bridge" parent="Platform.MaterialComponents.Dialog">
3439
<item name="isMaterialTheme">true</item>
3540

3641
<item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
@@ -113,7 +118,7 @@
113118
<item name="elevationOverlayColor">?attr/colorOnSurface</item>
114119
</style>
115120

116-
<style name="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Platform.MaterialComponents.Light.Dialog">
121+
<style name="Base.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Platform.MaterialComponents.Light.Dialog">
117122
<item name="isMaterialTheme">true</item>
118123

119124
<item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
@@ -196,16 +201,4 @@
196201
<item name="elevationOverlayColor">?attr/colorOnSurface</item>
197202
</style>
198203

199-
<!-- Themes in the "Base.Theme" family vary based on the current platform
200-
version to provide the correct basis on each device. You probably don't
201-
want to use them directly in your apps.
202-
203-
Themes in the "Theme.MaterialComponents" family are meant to be extended or used
204-
directly by apps. -->
205-
<eat-comment/>
206-
207-
<style name="Base.Theme.MaterialComponents.Dialog.Bridge" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge"/>
208-
209-
<style name="Base.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge"/>
210-
211204
</resources>

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,18 @@
120120

121121
<!-- Dialog theme overlays for MaterialComponents. -->
122122

123-
<style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
123+
<style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
124+
<item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
124125
<!-- Widget styles -->
125126
<item name="materialButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
126127
</style>
127128

128-
<style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
129+
<style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
129130
<!-- Widget styles -->
130131
<item name="buttonBarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
131132
</style>
132133

133-
<style name="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
134+
<style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
134135
<!-- Widget styles -->
135136
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_invisible</item>
136137
<item name="alertDialogStyle">@style/MaterialAlertDialog.MaterialComponents</item>
@@ -144,13 +145,6 @@
144145
<item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.MaterialComponents.Body.Text</item>
145146
</style>
146147

147-
<style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog">
148-
<item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
149-
</style>
150-
151-
<style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert"/>
152-
<style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog"/>
153-
154148
<!--
155149
MaterialComponents ThemeOverlays for Framework Alert Dialogs.
156150
-->

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,25 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Base.V14.Theme.Material3.Light.SideSheetDialog" parent="Theme.Material3.Light.Dialog">
18+
<style name="Base.Theme.Material3.Light.SideSheetDialog" parent="Theme.Material3.Light.Dialog">
1919
<item name="android:windowIsFloating">false</item>
2020
<item name="android:windowBackground">@android:color/transparent</item>
2121
<item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
2222
<item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
2323
</style>
2424

25-
<style name="Base.V14.Theme.Material3.Dark.SideSheetDialog" parent="Theme.Material3.Dark.Dialog">
25+
<style name="Base.Theme.Material3.Dark.SideSheetDialog" parent="Theme.Material3.Dark.Dialog">
2626
<item name="android:windowIsFloating">false</item>
2727
<item name="android:windowBackground">@android:color/transparent</item>
2828
<item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
2929
<item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
3030
</style>
3131

32-
<style name="Base.V14.ThemeOverlay.Material3.SideSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
32+
<style name="Base.ThemeOverlay.Material3.SideSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
33+
<item name="android:statusBarColor">@android:color/transparent</item>
3334
<item name="android:windowIsFloating">false</item>
3435
<item name="android:windowBackground">@android:color/transparent</item>
3536
<item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
3637
<item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
3738
</style>
38-
39-
<style name="Base.V21.ThemeOverlay.Material3.SideSheetDialog"
40-
parent="Base.V14.ThemeOverlay.Material3.SideSheetDialog">
41-
<item name="android:statusBarColor">@android:color/transparent</item>
42-
</style>
43-
44-
<style name="Base.Theme.Material3.Light.SideSheetDialog" parent="Base.V14.Theme.Material3.Light.SideSheetDialog"/>
45-
<style name="Base.Theme.Material3.Dark.SideSheetDialog" parent="Base.V14.Theme.Material3.Dark.SideSheetDialog"/>
46-
<style name="Base.ThemeOverlay.Material3.SideSheetDialog" parent="Base.V21.ThemeOverlay.Material3.SideSheetDialog"/>
4739
</resources>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@
203203
<item name="android:paddingBottom">13dp</item>
204204
</style>
205205

206-
<!-- Base styles for AutoCompleteTextView. You should use one of the sub-styles instead. -->
207-
<style name="Base.V14.Widget.MaterialComponents.AutoCompleteTextView" parent="Widget.AppCompat.AutoCompleteTextView">
206+
<!-- Base style for AutoCompleteTextView. You should use one of the sub-styles instead. -->
207+
<style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Widget.AppCompat.AutoCompleteTextView">
208208
<item name="enforceMaterialTheme">true</item>
209209
<item name="enforceTextAppearance">true</item>
210210
<item name="android:background">@null</item>
@@ -218,11 +218,8 @@
218218
<item name="android:paddingBottom">17dp</item>
219219
<item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
220220
<item name="android:dropDownVerticalOffset">@dimen/mtrl_exposed_dropdown_menu_popup_vertical_offset</item>
221-
<item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
222-
</style>
223-
224-
<style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Base.V14.Widget.MaterialComponents.AutoCompleteTextView">
225221
<item name="android:popupBackground">@null</item>
222+
<item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
226223
</style>
227224

228225
<!-- Styles for the AutocompleteTextView to be used if an ExposedDropdownMenu style is being used. -->

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

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

0 commit comments

Comments
 (0)