summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/res/res/values/styles_material.xml6
-rw-r--r--core/res/res/values/themes_material.xml9
2 files changed, 12 insertions, 3 deletions
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 1aae02bdeb76..8c1a9278dd25 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.
<style name="AlertDialog.Material.Light" />
<style name="DatePickerDialog.Material" parent="AlertDialog.Material">
- <item name="showTitle">true</item>
+ <item name="showTitle">false</item>
+ </style>
+
+ <style name="TimePickerDialog.Material" parent="AlertDialog.Material">
+ <item name="showTitle">false</item>
</style>
<!-- Window title -->
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 35ce9b049854..7e2867de1d7a 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.
<item name="timePickerStyle">@style/Widget.Material.TimePicker</item>
<!-- TimePicker dialog theme -->
- <item name="timePickerDialogTheme">?attr/dialogTheme</item>
+ <item name="timePickerDialogTheme">@style/ThemeOverlay.Material.Dialog.TimePicker</item>
<!-- DatePicker style -->
<item name="datePickerStyle">@style/Widget.Material.DatePicker</item>
@@ -733,7 +733,7 @@ please see themes_device_defaults.xml.
<item name="timePickerStyle">@style/Widget.Material.Light.TimePicker</item>
<!-- TimePicker dialog theme -->
- <item name="timePickerDialogTheme">?attr/dialogTheme</item>
+ <item name="timePickerDialogTheme">@style/ThemeOverlay.Material.Dialog.TimePicker</item>
<!-- DatePicker style -->
<item name="datePickerStyle">@style/Widget.Material.Light.DatePicker</item>
@@ -900,6 +900,11 @@ please see themes_device_defaults.xml.
<item name="colorBackground">?attr/colorBackgroundFloating</item>
</style>
+ <!-- Theme overlay that overrides window properties to display as a time picker dialog. -->
+ <style name="ThemeOverlay.Material.Dialog.TimePicker">
+ <item name="alertDialogStyle">@style/TimePickerDialog.Material</item>
+ </style>
+
<!-- Theme overlay that overrides window properties to display as a date picker dialog. -->
<style name="ThemeOverlay.Material.Dialog.DatePicker">
<item name="alertDialogStyle">@style/DatePickerDialog.Material</item>