Skip to content

Commit 269830e

Browse files
pekingmedsn5ft
authored andcommitted
[Shape][TimePicker] Clean up shape appearance hardcoded in layout files.
PiperOrigin-RevId: 448297165
1 parent 1414f9e commit 269830e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

lib/java/com/google/android/material/timepicker/res/layout/material_clock_period_toggle.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@
3636
android:id="@+id/material_clock_period_am_button"
3737
android:insetTop="8dp"
3838
android:layout_width="wrap_content"
39-
app:shapeAppearanceOverlay="?attr/shapeAppearanceMediumComponent"
4039
android:text="@string/material_timepicker_am"/>
4140
<com.google.android.material.button.MaterialButton
4241
style="?attr/materialButtonOutlinedStyle"
4342
android:id="@+id/material_clock_period_pm_button"
4443
android:layout_width="wrap_content"
4544
android:insetBottom="8dp"
46-
app:shapeAppearanceOverlay="?attr/shapeAppearanceMediumComponent"
4745
android:text="@string/material_timepicker_pm"/>
4846

4947
</com.google.android.material.button.MaterialButtonToggleGroup>

lib/java/com/google/android/material/timepicker/res/layout/material_time_input.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
android:layout_width="wrap_content"
2121
android:layout_height="wrap_content"
2222
app:errorIconDrawable="@null"
23-
app:hintEnabled="false"
24-
app:shapeAppearance="?attr/shapeAppearanceMediumComponent"
25-
app:shapeAppearanceOverlay="@null">
23+
app:hintEnabled="false" >
2624

2725
<com.google.android.material.textfield.TextInputEditText
2826
android:layout_width="96dp"

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
</style>
7171

7272
<style name="Widget.MaterialComponents.TimePicker.Display.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
73+
<item name="shapeAppearance">?attr/shapeAppearanceMediumComponent</item>
74+
<item name="shapeAppearanceOverlay">@null</item>
7375
<item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TimePicker.Display.TextInputEditText</item>
7476
</style>
7577

@@ -110,6 +112,7 @@
110112
<item name="android:textAlignment">center</item>
111113
<item name="strokeColor">@color/material_timepicker_button_stroke</item>
112114
<item name="strokeWidth">@dimen/mtrl_btn_stroke_size</item>
115+
<item name="shapeAppearanceOverlay">?attr/shapeAppearanceMediumComponent</item>
113116
</style>
114117

115118
<style name="TextAppearance.MaterialComponents.TimePicker.Title" parent="TextAppearance.MaterialComponents.Overline">
@@ -129,6 +132,8 @@
129132
<item name="iconTint">@color/m3_timepicker_button_text_color</item>
130133
<item name="rippleColor">@color/m3_timepicker_button_ripple_color</item>
131134
<item name="strokeColor">?attr/colorOutline</item>
135+
<item name="shapeAppearance">?attr/shapeAppearanceCornerSmall</item>
136+
<item name="shapeAppearanceOverlay">@null</item>
132137
<!-- Apply theme overlay to disable elevation overlays so we can get a purely colorSurface chip. -->
133138
<item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TimePicker.Display</item>
134139
</style>
@@ -159,6 +164,7 @@
159164
</style>
160165

161166
<style name="Widget.Material3.MaterialTimePicker.Display.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
167+
<item name="shapeAppearance">?attr/shapeAppearanceCornerSmall</item>
162168
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.MaterialTimePicker.Display.TextInputEditText</item>
163169
</style>
164170

0 commit comments

Comments
 (0)