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

Commit 44787ffd authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing colorFilter not properly applied to user badges" into main

parents 5bca894f b5cbe9ea

iconloaderlib/res/drawable/ic_clone_app_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:height="@dimen/profile_badge_size"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#ff3C4043">

    android:tint="@color/badge_tint_clone">



    <group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">

      <path

iconloaderlib/res/drawable/ic_instant_app_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:height="@dimen/profile_badge_size"

    android:viewportWidth="18"

    android:viewportHeight="18"

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

    android:tint="@color/badge_tint_instant">



    <path

        android:fillColor="#FFFFFFFF"

iconloaderlib/res/drawable/ic_private_profile_app_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="@dimen/profile_badge_size"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="#001A41">

        android:tint="@color/badge_tint_private">

    <path

        android:pathData="M11.033,14H12.967L12.6,11.85C12.789,11.75 12.933,11.606 13.033,11.417C13.144,11.228 13.2,11.022 13.2,10.8C13.2,10.467 13.083,10.183 12.85,9.95C12.617,9.717 12.333,9.6 12,9.6C11.667,9.6 11.383,9.717 11.15,9.95C10.917,10.183 10.8,10.467 10.8,10.8C10.8,11.022 10.85,11.228 10.95,11.417C11.061,11.606 11.211,11.75 11.4,11.85L11.033,14ZM12,18.4C10.5,18.033 9.256,17.183 8.267,15.85C7.289,14.517 6.8,13.039 6.8,11.417V7.6L12,5.6L17.2,7.6V11.417C17.2,13.039 16.706,14.517 15.717,15.85C14.739,17.183 13.5,18.033 12,18.4ZM12,17.15C13.156,16.794 14.111,16.078 14.867,15C15.622,13.922 16,12.728 16,11.417V8.417L12,6.883L8,8.417V11.417C8,12.728 8.378,13.922 9.133,15C9.889,16.078 10.844,16.794 12,17.15Z"

        android:fillColor="#FFFFFFFF"/>

iconloaderlib/res/drawable/ic_work_app_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    android:height="@dimen/profile_badge_size"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#1A73E8">

    android:tint="@color/badge_tint_work">



    <group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">

        <path

iconloaderlib/res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
    <color name="themed_badge_icon_color">#0842A0</color>

    <color name="themed_badge_icon_background_color">#D3E3FD</color>



    <color name="badge_tint_instant">@android:color/black</color>

    <color name="badge_tint_work">#1A73E8</color>

    <color name="badge_tint_private">#001A41</color>

    <color name="badge_tint_clone">#ff3C4043</color>



    <!-- Yellow 600, used for highlighting "important" conversations in settings & notifications -->

    <color name="important_conversation">#f9ab00</color>

</resources>