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

Commit b225600f authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge changes from topic "avatarcolorsupdate" into tm-mainline-prod am: e696fc6a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607300



Change-Id: I6613bd524d9d8b7ee7d912d50d6453cee931981b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39120a1c e696fc6a

core/res/res/values-night/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -35,4 +35,9 @@ 
    <color name="personal_apps_suspension_notification_color">#8AB4F8</color>



    <color name="overview_background">@color/overview_background_dark</color>



    <color name="user_icon_4">#fff439a0</color><!-- pink -->

    <color name="user_icon_6">#ff4ecde6</color><!-- cyan -->

    <color name="user_icon_7">#fffbbc04</color><!-- yellow -->

    <color name="user_icon_8">#fffa903e</color><!-- orange -->

</resources>

core/res/res/values/colors.xml

+8 −8
Original line number Diff line number Diff line
@@ -174,14 +174,14 @@ 
    <color name="system_notification_accent_color">#00000000</color>



    <!-- Default user icon colors -->

    <color name="user_icon_1">#ff00bcd4</color><!-- cyan 500 -->

    <color name="user_icon_2">#ff3f51b5</color><!-- indigo 500 -->

    <color name="user_icon_3">#ff4285f4</color><!-- blue 500 -->

    <color name="user_icon_4">#ffe91e63</color><!-- pink 500 -->

    <color name="user_icon_5">#ff0f9d58</color><!-- green 500 -->

    <color name="user_icon_6">#ff8bc34a</color><!-- light green 500 -->

    <color name="user_icon_7">#ffff9800</color><!-- orange 500 -->

    <color name="user_icon_8">#ffff5722</color><!-- deep orange 500 -->

    <color name="user_icon_1">#ffe46962</color><!-- red -->

    <color name="user_icon_2">#ffaf5cf7</color><!-- purple -->

    <color name="user_icon_3">#ff4c8df6</color><!-- blue -->

    <color name="user_icon_4">#fff439a0</color><!-- pink -->

    <color name="user_icon_5">#ff1ea446</color><!-- green -->

    <color name="user_icon_6">#ff129eaf</color><!-- cyan -->

    <color name="user_icon_7">#ffb26c00</color><!-- yellow -->

    <color name="user_icon_8">#ffe8710a</color><!-- orange -->

    <color name="user_icon_default_gray">#ff9e9e9e</color><!-- gray 500 -->

    <color name="user_icon_default_white">#ffffffff</color><!-- white -->