Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd726e0f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes I4c205ca9,I847e4d1e into nyc-mr1-dev-plus-aosp 

* changes:
  Merge \"Remove date & time picker dialog titles to conform to Material spec\" into nyc-mr1-dev am: d2b30510
  Remove date & time picker dialog titles to conform to Material spec am: 5874c80c
parents fe2211ee 811cfb45

core/res/res/values/styles_material.xml

+5 −1
Original line number Diff line number Diff line
@@ -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 -->

core/res/res/values/themes_material.xml

+7 −2
Original line number Diff line number Diff line
@@ -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>