Skip to content

Commit

Permalink
[TimePicker] Renamed ThemeOverlay.MaterialComponents.MaterialTimePick…
Browse files Browse the repository at this point in the history
…er to ThemeOverlay.MaterialComponents.TimePicker to be more consistent with other time picker styles

PiperOrigin-RevId: 347692913
(cherry picked from commit 4af9eab)
  • Loading branch information
dsn5ft committed Dec 15, 2020
1 parent 1290f82 commit 130993d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.MaterialTimePicker</item>
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.TimePicker</item>
</style>

<style name="Base.V14.Theme.MaterialComponents.Light" parent="Base.V14.Theme.MaterialComponents.Light.Bridge">
Expand Down Expand Up @@ -129,7 +129,7 @@
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.MaterialTimePicker</item>
<item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.TimePicker</item>
</style>

<!-- Themes in the "Base.Theme" family vary based on the current platform
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<public name="clockHandColor" type="attr" />
<public name="clockNumberTextColor" type="attr" />

<public name="ThemeOverlay.MaterialComponents.MaterialTimePicker" type="style" />
<public name="ThemeOverlay.MaterialComponents.TimePicker" type="style" />

<public name="Widget.MaterialComponents.TimePicker" type="style" />
<public name="Widget.MaterialComponents.TimePicker.Button" type="style" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<resources>

<style name="ThemeOverlay.MaterialComponents.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.Dialog">
<style name="ThemeOverlay.MaterialComponents.TimePicker" parent="ThemeOverlay.MaterialComponents.Dialog">
<item name="chipStyle">@style/Widget.MaterialComponents.TimePicker.Display</item>
<item name="materialClockStyle">@style/Widget.MaterialComponents.TimePicker.Clock</item>
<item name="imageButtonStyle">@style/Widget.MaterialComponents.TimePicker.ImageButton</item>
Expand Down

0 comments on commit 130993d

Please sign in to comment.