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

Commit 9f03240e authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Default colored notifications use accent color for icon; System... 

Merge "Default colored notifications use accent color for icon; System notifications use default color." into sc-dev am: 1b3157fa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0dd994fdd44fa11d88ca4d99055364c461003b2
parents 1506d2f5 1b3157fa

core/java/android/app/Notification.java

+3 −0
Original line number Diff line number Diff line
@@ -6254,6 +6254,9 @@ public class Notification implements Parcelable 
            if (rawColor == COLOR_DEFAULT) {

                ensureColors(p);

                color = ContrastColorUtil.resolveDefaultColor(mContext, background, mInNightMode);

                if (mTintWithThemeAccent) {

                    color = obtainThemeColor(R.attr.colorAccent, color);

                }

            } else {

                color = ContrastColorUtil.resolveContrastColor(mContext, rawColor,

                        background, mInNightMode);

core/res/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 
    <color name="accessibility_focus_highlight_color">#bf39b500</color>

    <color name="autofilled_highlight">#4dffeb3b</color>



    <color name="system_notification_accent_color">#ff607D8B</color>

    <color name="system_notification_accent_color">#00000000</color>



    <!-- Default user icon colors -->

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