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

Commit 7306924c authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev 

* commit 'f65bf6e62ff61d5c5e5c3dc5ca468d3feb2c8175':
  Explicitly set Settings background to white
parents 193b14c4 ef686b3c

core/res/res/values/themes_material.xml

+6 −4
Original line number Diff line number Diff line
@@ -771,8 +771,6 @@ please see themes_device_defaults.xml. 
        <item name="textCheckMark">@drawable/indicator_check_mark_light</item>

        <item name="textCheckMarkInverse">@drawable/indicator_check_mark_dark</item>



        <item name="windowBackground">@color/background_material_light</item>



        <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item>

        <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item>
@@ -809,8 +807,6 @@ please see themes_device_defaults.xml. 
        <item name="textCheckMark">@drawable/indicator_check_mark_dark</item>

        <item name="textCheckMarkInverse">@drawable/indicator_check_mark_light</item>



        <item name="windowBackground">@color/background_material_dark</item>



        <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item>

        <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item>
@@ -1227,6 +1223,7 @@ please see themes_device_defaults.xml. 


    <!-- Default theme for Settings and activities launched from Settings. -->

    <style name="Theme.Material.Settings" parent="Theme.Material.Light.DarkActionBar">

        <item name="colorBackground">@color/white</item>

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>
@@ -1239,6 +1236,7 @@ please see themes_device_defaults.xml. 
    </style>



    <style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.Light.BaseDialog">

        <item name="colorBackground">@color/white</item>

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>
@@ -1247,6 +1245,7 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog" />



    <style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.Light.Dialog.BaseAlert">

        <item name="colorBackground">@color/white</item>

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>
@@ -1255,18 +1254,21 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.BaseAlert" />



    <style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation">

        <item name="colorBackground">@color/white</item>

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>

    </style>



    <style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.Light.SearchBar">

        <item name="colorBackground">@color/white</item>

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>

    </style>



    <style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.Light.CompactMenu">

        <item name="colorBackground">@color/white</item>

        <item name="colorPrimary">@color/material_blue_grey_900</item>

        <item name="colorPrimaryDark">@color/material_blue_grey_950</item>

        <item name="colorAccent">@color/material_deep_teal_500</item>