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

Commit b0a2fbce authored by Alan Viverette's avatar Alan Viverette
Browse files

Refactor theme colors, fix dialog background, accent in light Settings 

Bug: 19706726
Change-Id: If81c0a4775c366ae1a278d79f6353670182f7d27
parent 2a16460c

core/res/res/values/colors_material.xml

+30 −18
Original line number Diff line number Diff line
@@ -16,16 +16,19 @@ 


<!-- Colors specific to Material themes. -->

<resources>

    <color name="background_material_dark">#ff303030</color>

    <color name="background_material_light">#fffafafa</color>

    <color name="background_floating_material_dark">#ff424242</color>

    <color name="background_floating_material_light">#ffffffff</color>

    <color name="foreground_material_dark">@color/white</color>

    <color name="foreground_material_light">@color/black</color>



    <color name="background_material_dark">@color/material_grey_850</color>

    <color name="background_material_light">@color/material_grey_50</color>

    <color name="background_floating_material_dark">@color/material_grey_800</color>

    <color name="background_floating_material_light">@color/white</color>



    <color name="primary_material_dark">#ff212121</color>

    <color name="primary_material_light">#fff5f5f5</color>

    <color name="primary_dark_material_dark">#ff000000</color>

    <color name="primary_dark_material_light">#ff757575</color>

    <color name="primary_dark_material_light_light_status_bar">#ffe0e0e0</color>

    <color name="primary_material_dark">@color/material_grey_900</color>

    <color name="primary_material_light">@color/material_grey_100</color>

    <color name="primary_dark_material_dark">@color/black</color>

    <color name="primary_dark_material_light">@color/material_grey_600</color>

    <color name="primary_dark_material_light_light_status_bar">@color/material_grey_300</color>



    <color name="accent_material_light">@color/material_deep_teal_500</color>

    <color name="accent_material_dark">@color/material_deep_teal_200</color>
@@ -38,19 +41,20 @@ 
    <color name="switch_thumb_disabled_material_dark">#ff616161</color>

    <color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>



    <color name="foreground_material_dark">@color/white</color>

    <color name="foreground_material_light">@color/black</color>



    <color name="link_text_material_dark">@color/material_deep_teal_200</color>

    <color name="link_text_material_light">@color/material_deep_teal_500</color>

    <color name="link_text_material_dark">@color/material_deep_teal_200</color>



    <!-- Text & foreground colors -->

    <eat-comment />



    <!-- 87% black -->

    <color name="primary_text_default_material_light">#de000000</color>

    <!-- 54% black -->

    <color name="secondary_text_default_material_light">#8a000000</color>



    <!-- 100% white -->

    <color name="primary_text_default_material_dark">#ffffffff</color>

    <!-- 70% white -->

    <color name="secondary_text_default_material_dark">#b3ffffff</color>



    <item name="hint_alpha_material_dark" format="float" type="dimen">0.50</item>
@@ -66,6 +70,14 @@ 
    <!-- Primary & accent colors -->

    <eat-comment />



    <color name="material_grey_900">#ff212121</color>

    <color name="material_grey_850">#ff303030</color>

    <color name="material_grey_800">#ff424242</color>

    <color name="material_grey_600">#ff757575</color>

    <color name="material_grey_300">#ffe0e0e0</color>

    <color name="material_grey_100">#fff5f5f5</color>

    <color name="material_grey_50">#fffafafa</color>



    <color name="material_deep_teal_200">#ff80cbc4</color>

    <color name="material_deep_teal_500">#ff009688</color>
@@ -98,16 +110,16 @@ 
    <color name="datepicker_default_disabled_text_color_material_light">#80999999</color>

    <color name="datepicker_default_disabled_text_color_material_dark">#80999999</color>



    <color name="datepicker_default_selected_text_color_material_light">#33b5e5</color>

    <color name="datepicker_default_selected_text_color_material_dark">#33b5e5</color>

    <color name="datepicker_default_selected_text_color_material_light">#ff33b5e5</color>

    <color name="datepicker_default_selected_text_color_material_dark">#ff33b5e5</color>



    <color name="datepicker_default_pressed_text_color_material_light">#0099cc</color>

    <color name="datepicker_default_pressed_text_color_material_dark">#0099cc</color>

    <color name="datepicker_default_pressed_text_color_material_light">#ff0099cc</color>

    <color name="datepicker_default_pressed_text_color_material_dark">#ff0099cc</color>



    <color name="datepicker_default_circle_background_color_material_light">@color/material_deep_teal_500</color>

    <color name="datepicker_default_circle_background_color_material_dark">@color/material_deep_teal_200</color>



    <color name="datepicker_default_view_animator_color_material_light">#f2f2f2</color>

    <color name="datepicker_default_view_animator_color_material_light">#fff2f2f2</color>

    <color name="datepicker_default_view_animator_color_material_dark">#ff303030</color>



</resources>

core/res/res/values/themes_material.xml

+1 −5
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ please see themes_device_defaults.xml. 
    <!-- Theme overlay that overrides window properties to display as a dialog. -->

    <style name="ThemeOverlay.Material.Dialog">

        <item name="colorBackgroundCacheHint">@null</item>

        <item name="colorBackground">?attr/colorBackgroundFloating</item>



        <item name="windowFrame">@null</item>

        <item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>
@@ -1271,7 +1272,6 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings" parent="Theme.Material.DayNight.DarkActionBar">

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



        <item name="presentationTheme">@style/Theme.Material.Settings.Dialog.Presentation</item>

        <item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>
@@ -1281,7 +1281,6 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.DayNight.BaseDialog">

        <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.Dialog" parent="Theme.Material.Settings.BaseDialog" />
@@ -1289,7 +1288,6 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.DayNight.Dialog.BaseAlert">

        <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.Dialog.Alert" parent="Theme.Material.Settings.Dialog.BaseAlert" />
@@ -1297,7 +1295,6 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.DayNight.Dialog.Presentation">

        <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.DayNight.SearchBar">
@@ -1309,6 +1306,5 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.DayNight.CompactMenu">

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

</resources>