commit d9c4cac4c77edee1b535583e233072aeeb299d20
author Lucas Dupin <dupin@google.com> Tue Apr 02 16:58:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 02 16:58:27 2019 +0000
tree 6f86b213bf426bfe124cbbbeb45fa1770c29998b
parent 44eaac327bf9bc2ab129f152ad2ab14f7b24cfe8
parent f15c5e5181486c99019e15a5c235103ab78a391a

Merge "Do not colorize dark mode actions"

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 11fa343..0ab1a85 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -5571,7 +5571,7 @@
                     button.setTextColor(R.id.action0, textColor);
                     rippleColor = textColor;
                 } else if (getRawColor(p) != COLOR_DEFAULT && !isColorized(p)
-                        && mTintActionButtons) {
+                        && mTintActionButtons && !mInNightMode) {
                     rippleColor = resolveContrastColor(p);
                     button.setTextColor(R.id.action0, rippleColor);
                 } else {