Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove date & time picker dialog titles to conform to Material spec am: 5874c80c2a

Browse Source 
am: 92c77fa9bb

Change-Id: Ic069e2821f0b3f74accc2612dd478fee25b10d82
This commit is contained in:
Alan Viverette
2016-07-22 07:11:24 +00:00
committed by android-build-merger
parent 50a22baded 92c77fa9bb
commit 142d5d8670
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/values/styles_material.xml
View File

@@ -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 -->

9
core/res/res/values/themes_material.xml
View File

@@ -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>