diff options
| author | 2016-07-19 13:11:41 -0400 | |
|---|---|---|
| committer | 2016-07-20 12:14:31 -0400 | |
| commit | 5874c80c2a1f4e772016e289ca291082930cd932 (patch) | |
| tree | 53407978c271bb8faaebe0fec81a43f69b5bad01 | |
| parent | 761d89ef4eac16e0619e4e1bd5201b04caccafde (diff) | |
Remove date & time picker dialog titles to conform to Material spec
Also fixes issue with time picker on sw360dp-land screens.
Bug: 30104569
Change-Id: I121e03b877d751b0eb0bf4acde405813bc8ab766
| -rw-r--r-- | core/res/res/values/styles_material.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/themes_material.xml | 9 |
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> |