Skip to content

Commit 9c5f182

Browse files
committed
[TimePicker] Inherit M3 timepicker button style from M3 button style
1 parent da48227 commit 9c5f182

File tree

1 file changed

+16
-2
lines changed
  • lib/java/com/google/android/material/timepicker/res/values

1 file changed

+16
-2
lines changed

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
@@ -132,7 +132,13 @@
132132
<item name="focusRingsInset">2dp</item>
133133
</style>
134134

135-
<style name="Widget.Material3.MaterialTimePicker.Button" parent="Widget.MaterialComponents.TimePicker.Button">
135+
<style name="Widget.Material3.MaterialTimePicker.Button" parent="Widget.Material3.Button.OutlinedButton">
136+
<item name="android:layout_height">48dp</item>
137+
<item name="android:padding">0dp</item>
138+
<item name="android:insetTop">0dp</item>
139+
<item name="android:insetBottom">0dp</item>
140+
<item name="android:textSize">16sp</item>
141+
<item name="android:textAlignment">center</item>
136142
<item name="android:textAppearance">@macro/m3_comp_time_picker_period_selector_label_text_type</item>
137143
<item name="android:textColor">@color/m3_timepicker_button_text_color</item>
138144
<item name="backgroundTint">@color/m3_timepicker_button_background_color</item>
@@ -143,7 +149,15 @@
143149
<item name="shapeAppearance">@macro/m3_comp_time_picker_period_selector_container_shape</item>
144150
<item name="shapeAppearanceOverlay">@null</item>
145151
<!-- Apply theme overlay to disable elevation overlays so we can get a purely colorSurface chip. -->
146-
<item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TimePicker.Display</item>
152+
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.TimePicker.Button</item>
153+
</style>
154+
155+
<!-- Disabling elevation overlays because when chip's default
156+
background/surface composite are combined with elevation overlays in a
157+
highly elevated dialog, the resulting color becomes too light and causes
158+
contrast issues -->
159+
<style name="ThemeOverlay.Material3.TimePicker.Button" parent="ThemeOverlay.Material3.Button.TextButton">
160+
<item name="elevationOverlayEnabled">false</item>
147161
</style>
148162

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

0 commit comments

Comments
 (0)