From 25ea5b8586169b1bc95f346ddebfea7f70b21de3 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 27 Apr 2016 16:34:35 -0700
Subject: [PATCH] Fix contrast enforcement for RemoteInputView

Previously, the disabled color was used for the contrast
calculations, which resulted in too dark RemoteInputView
backgrounds.

Change-Id: I99e8b2fa64a22a59fdc5d1be8a6aff5af3523a27
Fixes: 28429720
---
 packages/SystemUI/res/color/remote_input_text.xml               | 2 +-
 packages/SystemUI/res/values/colors.xml                         | 1 +
 .../com/android/systemui/statusbar/NotificationContentView.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/color/remote_input_text.xml b/packages/SystemUI/res/color/remote_input_text.xml
index 11ce0b7effa95..8e18e16f8abcb 100644
--- a/packages/SystemUI/res/color/remote_input_text.xml
+++ b/packages/SystemUI/res/color/remote_input_text.xml
@@ -16,6 +16,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:color="@android:color/white" />
+    <item android:state_enabled="true" android:color="@color/remote_input_text_enabled" /> <!-- white -->
     <item android:color="#99ffffff" /> <!-- 60% white -->
 </selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index c75741c1d4870..cb51649459231 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -157,6 +157,7 @@
     <color name="minimize_dock_shadow_end">#00000000</color>
 
     <color name="default_remote_input_background">@*android:color/notification_default_color</color>
+    <color name="remote_input_text_enabled">#ffffffff</color>
     <color name="remote_input_hint">#99ffffff</color>
 
     <color name="remote_input_accent">#eeeeee</color>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 81303fe6be9cb..a026a96ab48e8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -846,7 +846,7 @@ public class NotificationContentView extends FrameLayout {
                     color = mContext.getColor(R.color.default_remote_input_background);
                 }
                 existing.setBackgroundColor(NotificationColorUtil.ensureTextBackgroundColor(color,
-                        mContext.getColor(R.color.remote_input_text),
+                        mContext.getColor(R.color.remote_input_text_enabled),
                         mContext.getColor(R.color.remote_input_hint)));
 
                 if (existingPendingIntent != null || existing.isActive()) {