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

Commit 634ef35b authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Update date and time picker headers for dark theme"

parents e7666f9e fd6cd3b6

core/res/res/drawable/time_picker_header_material.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

        android:color="?attr/colorControlHighlight">

    <item android:drawable="?attr/colorAccent" />

</ripple>

core/res/res/values/styles_material.xml

+9 −5
Original line number Diff line number Diff line
@@ -662,11 +662,11 @@ please see styles_device_defaults.xml. 
        <item name="internalLayout">@layout/time_picker_material</item>

        <item name="headerTimeTextAppearance">@style/TextAppearance.Material.TimePicker.TimeLabel</item>

        <item name="headerAmPmTextAppearance">@style/TextAppearance.Material.TimePicker.AmPmLabel</item>

        <item name="headerBackground">@drawable/time_picker_header_material</item>

        <item name="headerBackground">?attr/colorAccent</item>

        <item name="numbersTextColor">?attr/textColorPrimaryActivated</item>

        <item name="numbersInnerTextColor">?attr/textColorSecondaryActivated</item>

        <item name="numbersBackgroundColor">#08ffffff</item>

        <item name="numbersSelectorColor">?attr/colorControlActivated</item>

        <item name="numbersBackgroundColor">#ff555555</item>

        <item name="amPmTextColor">?attr/textColorSecondary</item>

    </style>
@@ -676,9 +676,9 @@ please see styles_device_defaults.xml. 
        <item name="calendarViewShown">true</item>

        <!-- Attributes for new-style DatePicker. -->

        <item name="internalLayout">@layout/date_picker_material</item>

        <item name="headerBackground">?attr/colorAccent</item>

        <item name="yearListItemTextAppearance">@style/TextAppearance.Material.DatePicker.List.YearLabel</item>

        <item name="yearListItemActivatedTextAppearance">@style/TextAppearance.Material.DatePicker.List.YearLabel.Activated</item>

        <item name="headerBackground">#</item>

    </style>



    <style name="Widget.Material.ActivityChooserView" parent="Widget.ActivityChooserView">
@@ -1033,10 +1033,14 @@ please see styles_device_defaults.xml. 
    <style name="Widget.Material.Light.NumberPicker" parent="Widget.Material.NumberPicker"/>



    <style name="Widget.Material.Light.TimePicker" parent="Widget.Material.TimePicker">

        <item name="numbersBackgroundColor">#10000000</item>

        <item name="headerBackground">?attr/colorAccent</item>

        <item name="numbersBackgroundColor">#ffeeeeee</item>

    </style>



    <style name="Widget.Material.Light.DatePicker" parent="Widget.Material.DatePicker">

        <item name="headerBackground">?attr/colorAccent</item>

    </style>



    <style name="Widget.Material.Light.DatePicker" parent="Widget.Material.DatePicker" />

    <style name="Widget.Material.Light.ActivityChooserView" parent="Widget.Material.ActivityChooserView" />

    <style name="Widget.Material.Light.ImageWell" parent="Widget.Material.ImageWell"/>

    <style name="Widget.Material.Light.ListView" parent="Widget.Material.ListView"/>