Skip to content

Commit 91a2550

Browse files
paulfthomasdsn5ft
authored andcommitted
[DatePicker] Migrate to new shape system
PiperOrigin-RevId: 448057183
1 parent cfeb31a commit 91a2550

File tree

1 file changed

+4
-9
lines changed
  • lib/java/com/google/android/material/datepicker/res/values

1 file changed

+4
-9
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
limitations under the License.
1616
-->
1717

18-
<resources xmlns:tools="http://schemas.android.com/tools">
18+
<resources>
1919

2020
<style name="MaterialAlertDialog.MaterialComponents.Picker.Date.Spinner" parent="android:Widget.DeviceDefault.DatePicker">
2121
<item name="backgroundInsetTop">@dimen/mtrl_alert_dialog_picker_background_inset</item>
@@ -203,13 +203,12 @@
203203
<item name="yearSelectedStyle">@style/Widget.Material3.MaterialCalendar.Year.Selected</item>
204204
<item name="yearTodayStyle">@style/Widget.Material3.MaterialCalendar.Year.Today</item>
205205
<item name="rangeFillColor">?attr/colorSurfaceVariant</item>
206+
<item name="shapeAppearance">?attr/shapeAppearanceCornerExtraLarge</item>
206207
</style>
207208

208209
<style name="Widget.Material3.MaterialCalendar.Fullscreen">
209210
<item name="android:windowFullscreen">true</item>
210-
<item name="shapeAppearanceOverlay">
211-
@style/ShapeAppearanceOverlay.MaterialComponents.MaterialCalendar.Window.Fullscreen
212-
</item>
211+
<item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.None</item>
213212
</style>
214213

215214
<style name="Widget.Material3.MaterialCalendar.HeaderLayout" parent="Widget.MaterialComponents.MaterialCalendar.HeaderLayout">
@@ -263,8 +262,7 @@
263262
<item name="itemTextColor">?attr/colorOnSurface</item>
264263
<item name="itemStrokeColor">@color/m3_calendar_item_stroke_color</item>
265264
<item name="itemStrokeWidth">1dp</item>
266-
<item name="itemShapeAppearance">?attr/shapeAppearanceSmallComponent</item>
267-
<item name="itemShapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MaterialComponents.MaterialCalendar.Day</item>
265+
<item name="itemShapeAppearance">@style/ShapeAppearance.Material3.Corner.Full</item>
268266
</style>
269267

270268
<style name="Widget.Material3.MaterialCalendar.Day" parent="Widget.Material3.MaterialCalendar.Item">
@@ -294,9 +292,6 @@
294292
</style>
295293

296294
<style name="Widget.Material3.MaterialCalendar.Year" parent="Widget.Material3.MaterialCalendar.Item">
297-
<item name="itemShapeAppearanceOverlay">
298-
@style/ShapeAppearanceOverlay.MaterialComponents.MaterialCalendar.Year
299-
</item>
300295
<item name="android:width">@dimen/mtrl_calendar_year_width</item>
301296
<item name="android:height">@dimen/mtrl_calendar_year_height</item>
302297
<item name="android:insetTop">@dimen/mtrl_calendar_year_vertical_padding</item>

0 commit comments

Comments
 (0)