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

Commit 9720a349 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Revert "Revert "Update material_deep_teal_500 to #008577."" 

This reverts commit 431d9d63.

Reason for revert: Rolling forward with a fix.

Change-Id: I5804e240535b84e0f4b2d306649b1981a9871632
Bug: 74118164
Test: atest cts/hostsidetests/theme
parent 79a0208c

core/res/res/values/colors_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
    <color name="material_deep_teal_100">#ffb2dfdb</color>

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

    <color name="material_deep_teal_300">#ff4db6ac</color>

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

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



    <color name="material_blue_grey_200">#ffb0bec5</color>

    <color name="material_blue_grey_700">#ff455a64</color>

libs/hwui/utils/Color.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ enum Color { 
    LightBlue_300 = 0xFF4FC3F7,

    LightBlue_500 = 0xFF03A9F4,

    Cyan_500 = 0xFF00BCD4,

    Teal_500 = 0xFF009688,

    Teal_500 = 0xFF008577,

    Teal_700 = 0xFF00796B,

    Green_500 = 0xFF4CAF50,

    Green_700 = 0xFF388E3C,

packages/PrintSpooler/res/drawable/ic_pdf_printer.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:height="36dp"

    android:viewportWidth="48.0"

    android:viewportHeight="48.0"

    android:tint="@color/pdf_printer_color">

    android:tint="@*android:color/accent_device_default_light">

    <path

        android:pathData="M40,4L16,4c-2.21,0 -4,1.79 -4,4v24c0,2.21 1.79,4 4,4h24c2.21,0 4,-1.79 4,-4L44,8c0,-2.21 -1.79,-4 -4,-4zM23,19c0,1.66 -1.34,3 -3,3h-2v4h-3L15,14h5c1.66,0 3,1.34 3,3v2zM33,23c0,1.66 -1.34,3 -3,3h-5L25,14h5c1.66,0 3,1.34 3,3v6zM41,17h-3v2h3v3h-3v4h-3L35,14h6v3zM18,19h2v-2h-2v2zM8,12L4,12v28c0,2.21 1.79,4 4,4h28v-4L8,40L8,12zM28,23h2v-6h-2v6z"

        android:fillColor="@android:color/black"/>

packages/PrintSpooler/res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -23,6 +23,4 @@ 
    <color name="unselected_page_background_color">#C0C0C0</color>



    <color name="material_grey_500">#ffa3a3a3</color>



    <color name="pdf_printer_color">#009688</color>

</resources>