Skip to content

Commit 130993d

Browse files
committed
[TimePicker] Renamed ThemeOverlay.MaterialComponents.MaterialTimePicker to ThemeOverlay.MaterialComponents.TimePicker to be more consistent with other time picker styles
PiperOrigin-RevId: 347692913 (cherry picked from commit 4af9eab)
1 parent 1290f82 commit 130993d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
7474
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
7575
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
76-
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.MaterialTimePicker</item>
76+
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.TimePicker</item>
7777
</style>
7878

7979
<style name="Base.V14.Theme.MaterialComponents.Light" parent="Base.V14.Theme.MaterialComponents.Light.Bridge">
@@ -129,7 +129,7 @@
129129
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
130130
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
131131
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
132-
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.MaterialTimePicker</item>
132+
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.TimePicker</item>
133133
</style>
134134

135135
<!-- Themes in the "Base.Theme" family vary based on the current platform

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<public name="clockHandColor" type="attr" />
2727
<public name="clockNumberTextColor" type="attr" />
2828

29-
<public name="ThemeOverlay.MaterialComponents.MaterialTimePicker" type="style" />
29+
<public name="ThemeOverlay.MaterialComponents.TimePicker" type="style" />
3030

3131
<public name="Widget.MaterialComponents.TimePicker" type="style" />
3232
<public name="Widget.MaterialComponents.TimePicker.Button" type="style" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<resources>
1919

20-
<style name="ThemeOverlay.MaterialComponents.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.Dialog">
20+
<style name="ThemeOverlay.MaterialComponents.TimePicker" parent="ThemeOverlay.MaterialComponents.Dialog">
2121
<item name="chipStyle">@style/Widget.MaterialComponents.TimePicker.Display</item>
2222
<item name="materialClockStyle">@style/Widget.MaterialComponents.TimePicker.Clock</item>
2323
<item name="imageButtonStyle">@style/Widget.MaterialComponents.TimePicker.ImageButton</item>

0 commit comments

Comments
 (0)