Skip to content

Commit 3414226

Browse files
pubiqqpubiqq
committed
[Internal] Update naming of base styles
1 parent c30c2d8 commit 3414226

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">
@@ -160,7 +157,7 @@
160157

161158
<!-- Base themes of Theme.Material3 themes for dialogs. -->
162159

163-
<style name="Base.V14.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
160+
<style name="Base.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
164161
<item name="isMaterial3Theme">true</item>
165162

166163
<!-- Color palettes -->
@@ -249,6 +246,7 @@
249246
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
250247
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
251248
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
249+
<item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
252250
<item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
253251
<item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
254252
<item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
@@ -480,7 +478,7 @@
480478
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Light</item>
481479
</style>
482480

483-
<style name="Base.V14.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
481+
<style name="Base.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
484482
<item name="isMaterial3Theme">true</item>
485483

486484
<!-- Color palettes -->
@@ -569,6 +567,7 @@
569567
<item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
570568
<item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
571569
<item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
570+
<item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
572571
<item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
573572
<item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
574573
<item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
@@ -800,9 +799,6 @@
800799
<item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
801800
</style>
802801

803-
<style name="Base.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog"/>
804-
<style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog"/>
805-
806802
<style name="Base.Theme.Material3.Light.Dialog.FixedSize">
807803
<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
808804
<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
@@ -817,7 +813,15 @@
817813
<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
818814
</style>
819815

820-
<style name="Base.V14.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge">
816+
<!-- Themes in the "Base.Theme" family vary based on the current platform
817+
version to provide the correct basis on each device. You probably don't
818+
want to use them directly in your apps.
819+
820+
Themes in the "Theme.MaterialComponents" family are meant to be extended or used
821+
directly by apps. -->
822+
<eat-comment/>
823+
824+
<style name="Base.Theme.MaterialComponents.Dialog" parent="Base.Theme.MaterialComponents.Dialog.Bridge">
821825
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
822826

823827
<item name="colorPrimary">@color/design_dark_default_color_primary</item>
@@ -863,18 +867,15 @@
863867
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
864868

865869
<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
870+
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
866871
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
867872

868873
<!-- Type styles -->
869874
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
870875
<item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
871876
</style>
872877

873-
<style name="Base.V21.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog">
874-
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
875-
</style>
876-
877-
<style name="Base.V14.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge">
878+
<style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.Theme.MaterialComponents.Light.Dialog.Bridge">
878879
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
879880

880881
<!-- Colors -->
@@ -920,29 +921,14 @@
920921
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
921922

922923
<item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
924+
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
923925
<item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
924926

925927
<!-- Type styles -->
926928
<item name="textAppearanceLargePopupMenu">?attr/textAppearanceSubtitle1</item>
927929
<item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
928930
</style>
929931

930-
<style name="Base.V21.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog">
931-
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
932-
</style>
933-
934-
<!-- Themes in the "Base.Theme" family vary based on the current platform
935-
version to provide the correct basis on each device. You probably don't
936-
want to use them directly in your apps.
937-
938-
Themes in the "Theme.MaterialComponents" family are meant to be extended or used
939-
directly by apps. -->
940-
<eat-comment/>
941-
942-
<style name="Base.Theme.MaterialComponents.Dialog" parent="Base.V21.Theme.MaterialComponents.Dialog"/>
943-
944-
<style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.V21.Theme.MaterialComponents.Light.Dialog"/>
945-
946932
<style name="Base.Theme.MaterialComponents.Dialog.Alert">
947933
<item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
948934
<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
@@ -128,17 +128,18 @@
128128

129129
<!-- Dialog theme overlays for M2. -->
130130

131-
<style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
131+
<style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
132+
<item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
132133
<!-- Widget styles -->
133134
<item name="materialButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
134135
</style>
135136

136-
<style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
137+
<style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
137138
<!-- Widget styles -->
138139
<item name="buttonBarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
139140
</style>
140141

141-
<style name="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
142+
<style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
142143
<!-- Widget styles -->
143144
<item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_invisible</item>
144145
<item name="alertDialogStyle">@style/MaterialAlertDialog.MaterialComponents</item>
@@ -152,13 +153,6 @@
152153
<item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.MaterialComponents.Body.Text</item>
153154
</style>
154155

155-
<style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog">
156-
<item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
157-
</style>
158-
159-
<style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert"/>
160-
<style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog"/>
161-
162156
<!--
163157
MaterialComponents ThemeOverlays for Framework Alert Dialogs.
164158
-->

‎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)