diff --git a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java index 366ebdd8ee2..a8ce76e969a 100644 --- a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java +++ b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java @@ -230,17 +230,26 @@ public final Dialog onCreateDialog(@Nullable Bundle bundle) { Dialog dialog = new Dialog(requireContext(), getThemeResId(requireContext())); Context context = dialog.getContext(); fullscreen = isFullscreen(context); - int surfaceColor = - MaterialAttributes.resolveOrThrow( - context, R.attr.colorSurface, MaterialDatePicker.class.getCanonicalName()); background = new MaterialShapeDrawable( context, null, R.attr.materialCalendarStyle, R.style.Widget_MaterialComponents_MaterialCalendar); + + TypedArray a = + context.obtainStyledAttributes( + null, + R.styleable.MaterialCalendar, + R.attr.materialCalendarStyle, + R.style.Widget_MaterialComponents_MaterialCalendar); + + int backgroundColor = a.getColor(R.styleable.MaterialCalendar_backgroundTint, 0); + + a.recycle(); + background.initializeElevationOverlay(context); - background.setFillColor(ColorStateList.valueOf(surfaceColor)); + background.setFillColor(ColorStateList.valueOf(backgroundColor)); background.setElevation(ViewCompat.getElevation(dialog.getWindow().getDecorView())); return dialog; } diff --git a/lib/java/com/google/android/material/datepicker/res/values/attrs.xml b/lib/java/com/google/android/material/datepicker/res/values/attrs.xml index 4920374be8c..34b22b32af3 100644 --- a/lib/java/com/google/android/material/datepicker/res/values/attrs.xml +++ b/lib/java/com/google/android/material/datepicker/res/values/attrs.xml @@ -39,6 +39,7 @@ + diff --git a/lib/java/com/google/android/material/datepicker/res/values/styles.xml b/lib/java/com/google/android/material/datepicker/res/values/styles.xml index b55611b36c9..612772ea1b3 100644 --- a/lib/java/com/google/android/material/datepicker/res/values/styles.xml +++ b/lib/java/com/google/android/material/datepicker/res/values/styles.xml @@ -31,6 +31,7 @@