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

Commit a59564bc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30037310'] into 24Q4-release. 

Change-Id: Ia3a1c1756ccbf5eae6a234ecee3840536e371ebf
parents 8dfd750d a30c5f85

iconloaderlib/res/values-night-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
*/

-->

<resources>

    <color name="themed_icon_color">@android:color/system_accent1_200</color>

    <color name="themed_icon_background_color">@android:color/system_accent2_800</color>

    <color name="themed_badge_icon_color">@android:color/system_accent2_800</color>

    <color name="themed_badge_icon_background_color">@android:color/system_accent1_200</color>

</resources>

iconloaderlib/res/values-night/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
** limitations under the License.

*/

-->

<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <color name="themed_icon_color">@androidprv:color/system_on_theme_app_dark</color>

    <color name="themed_icon_background_color">@androidprv:color/system_theme_app_dark</color>

<resources>

    <color name="themed_icon_color">#A8C7FA</color>

    <color name="themed_icon_background_color">#003355</color>

    <color name="themed_badge_icon_color">#003355</color>

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

</resources>

iconloaderlib/res/values-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
*/

-->

<resources>

    <color name="themed_icon_color">@android:color/system_accent1_700</color>

    <color name="themed_icon_background_color">@android:color/system_accent1_100</color>

    <color name="themed_badge_icon_color">@android:color/system_accent1_700</color>

    <color name="themed_badge_icon_background_color">@android:color/system_accent1_100</color>

</resources>

iconloaderlib/res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
** limitations under the License.

*/

-->

<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <color name="themed_icon_color">@androidprv:color/system_on_theme_app_light</color>

    <color name="themed_icon_background_color">@androidprv:color/system_theme_app_light</color>

<resources>

    <color name="themed_icon_color">#0842A0</color>

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

    <color name="themed_badge_icon_color">#0842A0</color>

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