diff options
| author | 2021-03-08 17:28:22 +0000 | |
|---|---|---|
| committer | 2021-03-08 17:28:22 +0000 | |
| commit | 1b3157fa770eac8c135d701d833a68586833874e (patch) | |
| tree | 91446fa32cb826c244a5fe5bbeb6e3bd1624a8eb | |
| parent | c9f7796ae68817deb8a19a72c891fc2925e83bef (diff) | |
| parent | 4f25624502cc19e352c8f2cfc2d62789deb16c84 (diff) | |
Merge "Default colored notifications use accent color for icon; System notifications use default color." into sc-dev
| -rw-r--r-- | core/java/android/app/Notification.java | 3 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 4ebed7a6cf43..de19ed61677a 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -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); diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index c00581f981af..22467e4c1402 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -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 --> |