diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 1aae02bdeb760..8c1a9278dd254 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -1208,7 +1208,11 @@ please see styles_device_defaults.xml.
+
+
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 35ce9b0498547..7e2867de1d7ac 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -370,7 +370,7 @@ please see themes_device_defaults.xml.
- @style/Widget.Material.TimePicker
- - ?attr/dialogTheme
+ - @style/ThemeOverlay.Material.Dialog.TimePicker
- @style/Widget.Material.DatePicker
@@ -733,7 +733,7 @@ please see themes_device_defaults.xml.
- @style/Widget.Material.Light.TimePicker
- - ?attr/dialogTheme
+ - @style/ThemeOverlay.Material.Dialog.TimePicker
- @style/Widget.Material.Light.DatePicker
@@ -900,6 +900,11 @@ please see themes_device_defaults.xml.
- ?attr/colorBackgroundFloating
+
+
+