Skip to content

Commit 035f48a

Browse files
committed
[TimePicker] Inherit M3 timepicker button style from M3 button style
1 parent 4b26950 commit 035f48a

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

  • lib/java/com/google/android/material/timepicker/res/values

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,13 @@
126126
<item name="clockNumberTextColor">@color/material_timepicker_clock_text_color</item>
127127
</style>
128128

129-
<style name="Widget.Material3.MaterialTimePicker.Button" parent="Widget.MaterialComponents.TimePicker.Button">
129+
<style name="Widget.Material3.MaterialTimePicker.Button" parent="Widget.Material3.Button.OutlinedButton">
130+
<item name="android:layout_height">48dp</item>
131+
<item name="android:padding">0dp</item>
132+
<item name="android:insetTop">0dp</item>
133+
<item name="android:insetBottom">0dp</item>
134+
<item name="android:textSize">16sp</item>
135+
<item name="android:textAlignment">center</item>
130136
<item name="android:textAppearance">@macro/m3_comp_time_picker_period_selector_label_text_type</item>
131137
<item name="android:textColor">@color/m3_timepicker_button_text_color</item>
132138
<item name="backgroundTint">@color/m3_timepicker_button_background_color</item>
@@ -137,7 +143,15 @@
137143
<item name="shapeAppearance">@macro/m3_comp_time_picker_period_selector_container_shape</item>
138144
<item name="shapeAppearanceOverlay">@null</item>
139145
<!-- Apply theme overlay to disable elevation overlays so we can get a purely colorSurface chip. -->
140-
<item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TimePicker.Display</item>
146+
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.TimePicker.Display</item>
147+
</style>
148+
149+
<!-- Disabling elevation overlays because when chip's default
150+
background/surface composite are combined with elevation overlays in a
151+
highly elevated dialog, the resulting color becomes too light and causes
152+
contrast issues -->
153+
<style name="ThemeOverlay.Material3.TimePicker.Display" parent="ThemeOverlay.Material3.Button.TextButton">
154+
<item name="elevationOverlayEnabled">false</item>
141155
</style>
142156

143157
<style name="Widget.Material3.MaterialTimePicker" parent="Widget.MaterialComponents.TimePicker">

0 commit comments

Comments
 (0)