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

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

Update branding colors 

BUG: 16845793
BUG: 16851916
Change-Id: I79a15752b5dda8f3c9f159826c61e3d2a6c8bd48
parent dbed893b

core/res/res/values/colors_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ 
    <color name="material_teal_A200">#ff18ffff</color>

    <color name="material_teal_A400">#ff00e5ff</color>



    <!-- Accent color used by Settings -->

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

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

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



    <color name="material_green_100">#ffb7e1cd</color>

    <color name="material_green_300">#ff57bb8a</color>

core/res/res/values/themes_material.xml

+5 −5
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ please see themes_device_defaults.xml. 
        <!-- 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_light_blue_A200</item>

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



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

        <item name="colorControlActivated">?attr/colorAccent</item>
@@ -712,9 +712,9 @@ please see themes_device_defaults.xml. 
        <item name="fastScrollOverlayPosition">atThumb</item>



        <!-- Color palette -->

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

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

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

        <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_A500</item>



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

        <item name="colorControlActivated">?attr/colorAccent</item>
@@ -1229,7 +1229,7 @@ please see themes_device_defaults.xml. 
    <style name="Theme.Material.Settings" parent="@style/Theme.Material.Light.DarkActionBar">

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

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

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

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

    </style>



</resources>

packages/PrintSpooler/res/values/themes.xml

+1 −4
Original line number Diff line number Diff line
@@ -16,16 +16,13 @@ 


<resources>



    <style name="PrintActivity" parent="@android:style/Theme.Material">

    <style name="PrintActivity" parent="@android:style/Theme.Material.Settings">

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:backgroundDimEnabled">false</item>

        <item name="android:colorPrimary">@*android:color/material_blue_grey_900</item>

        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item>

        <item name="android:colorAccent">@*android:color/material_dark_teal_A400</item>

    </style>



</resources>