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

Commit 9ad4d87a authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 

* commit 'd112a2d9afb11c46d9c806d70c794cfaf972e510':
  Update theme colors for better contrast and de-blueing
parents 23004127 edcb2d0e

core/res/res/values/colors_material.xml

+13 −5
Original line number Diff line number Diff line
@@ -16,11 +16,21 @@ 


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

<resources>

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

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

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

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

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

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



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

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

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

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



    <color name="ripple_material_light">#40000000</color>

    <color name="ripple_material_dark">#40ffffff</color>

    <color name="ripple_material_light">#40000000</color>



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

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



    <color name="button_material_dark">#ff5a595b</color>

    <color name="button_material_light">#ffd6d7d7</color>
@@ -73,8 +83,6 @@ 
    <color name="material_deep_teal_200">#ff80cbc4</color>

    <color name="material_deep_teal_500">#ff009688</color>



    <color name="material_blue_grey_50">#ffeceff1</color>

    <color name="material_blue_grey_100">#ffcfd8dc</color>

    <color name="material_blue_grey_800">#ff37474f</color>

    <color name="material_blue_grey_900">#ff263238</color>

    <color name="material_blue_grey_950">#ff21272b</color>

core/res/res/values/themes_material.xml

+12 −8
Original line number Diff line number Diff line
@@ -372,9 +372,9 @@ please see themes_device_defaults.xml. 
        <item name="fastScrollOverlayPosition">aboveThumb</item>



        <!-- Color palette -->

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

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

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

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

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

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

        <item name="colorEdgeEffect">?attr/colorPrimary</item>



        <item name="colorControlNormal">?attr/textColorSecondary</item>
@@ -716,9 +716,9 @@ please see themes_device_defaults.xml. 
        <item name="fastScrollOverlayPosition">aboveThumb</item>



        <!-- Color palette -->

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

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

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

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

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

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



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

        <item name="colorControlActivated">?attr/colorAccent</item>
@@ -736,8 +736,8 @@ please see themes_device_defaults.xml. 
        <item name="actionBarTheme">@style/ThemeOverlay.Material.Dark.ActionBar</item>

        <item name="actionBarPopupTheme">@style/ThemeOverlay.Material.Light</item>



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

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

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

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

    </style>



    <style name="ThemeOverlay" />
@@ -995,6 +995,8 @@ please see themes_device_defaults.xml. 
    <eat-comment />



    <style name="Theme.Material.BaseDialog">

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



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

        <item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>

        <item name="windowBackground">@drawable/dialog_background_material</item>
@@ -1109,6 +1111,8 @@ please see themes_device_defaults.xml. 
    <!-- Light material dialog themes -->



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

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



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

        <item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>

        <item name="windowBackground">@drawable/dialog_background_material</item>