diff --git a/lib/java/com/google/android/material/timepicker/MaterialTimePicker.java b/lib/java/com/google/android/material/timepicker/MaterialTimePicker.java index daaa6a8fce7..871f39d9a6c 100644 --- a/lib/java/com/google/android/material/timepicker/MaterialTimePicker.java +++ b/lib/java/com/google/android/material/timepicker/MaterialTimePicker.java @@ -179,9 +179,6 @@ public int getInputMode() { public final Dialog onCreateDialog(@Nullable Bundle bundle) { Dialog dialog = new Dialog(requireContext(), getThemeResId()); Context context = dialog.getContext(); - int surfaceColor = - MaterialAttributes.resolveOrThrow( - context, R.attr.colorSurface, MaterialTimePicker.class.getCanonicalName()); MaterialShapeDrawable background = new MaterialShapeDrawable( @@ -199,11 +196,12 @@ public final Dialog onCreateDialog(@Nullable Bundle bundle) { clockIcon = a.getResourceId(R.styleable.MaterialTimePicker_clockIcon, 0); keyboardIcon = a.getResourceId(R.styleable.MaterialTimePicker_keyboardIcon, 0); + int backgroundColor = a.getColor(R.styleable.MaterialTimePicker_backgroundTint, 0); a.recycle(); background.initializeElevationOverlay(context); - background.setFillColor(ColorStateList.valueOf(surfaceColor)); + background.setFillColor(ColorStateList.valueOf(backgroundColor)); Window window = dialog.getWindow(); window.setBackgroundDrawable(background); window.requestFeature(Window.FEATURE_NO_TITLE); diff --git a/lib/java/com/google/android/material/timepicker/res/values/attrs.xml b/lib/java/com/google/android/material/timepicker/res/values/attrs.xml index 35df306c6b3..b7a3b686d21 100644 --- a/lib/java/com/google/android/material/timepicker/res/values/attrs.xml +++ b/lib/java/com/google/android/material/timepicker/res/values/attrs.xml @@ -39,6 +39,7 @@ + diff --git a/lib/java/com/google/android/material/timepicker/res/values/styles.xml b/lib/java/com/google/android/material/timepicker/res/values/styles.xml index 028b45f75ff..7c94a17a8f8 100644 --- a/lib/java/com/google/android/material/timepicker/res/values/styles.xml +++ b/lib/java/com/google/android/material/timepicker/res/values/styles.xml @@ -21,6 +21,7 @@ ?shapeAppearanceMediumComponent @drawable/ic_keyboard_black_24dp @drawable/ic_clock_black_24dp + ?attr/colorSurface