summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2019-04-20 01:22:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-20 01:22:18 +0000
commite4b593b8e33a9cfc80072c473720aac6cb22c765 (patch)
tree6cd9417f263ff95cbf1ce5c1dbace7b1b2e46605
parent77a69b17fb7d61fbd2fab3b9268144ffe0412eba (diff)
parent7367eca78408b8a700f19499a98a5a1c424556b6 (diff)
Merge "Let there be color" into qt-dev
-rw-r--r--core/java/com/android/internal/util/ContrastColorUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/util/ContrastColorUtil.java b/core/java/com/android/internal/util/ContrastColorUtil.java
index d037d4b42eed..bf088e0a2755 100644
--- a/core/java/com/android/internal/util/ContrastColorUtil.java
+++ b/core/java/com/android/internal/util/ContrastColorUtil.java
@@ -455,7 +455,7 @@ public class ContrastColorUtil {
* Resolves {@param color} to an actual color if it is {@link Notification#COLOR_DEFAULT}
*/
public static int resolveColor(Context context, int color, boolean defaultBackgroundIsDark) {
- if (color == Notification.COLOR_DEFAULT || defaultBackgroundIsDark) {
+ if (color == Notification.COLOR_DEFAULT) {
int res = defaultBackgroundIsDark
? com.android.internal.R.color.notification_default_color_dark
: com.android.internal.R.color.notification_default_color_light;