Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev

am: 7461032

* commit '74610328f3298e53200b2588728a8acd7ba35be1':
  Fix contrast enforcement for RemoteInputView

Change-Id: I1053d3cf78e9cc79e92e5766baa1e0ea140eb64c
This commit is contained in:
Adrian Roos
2016-04-28 01:37:39 +00:00
committed by android-build-merger
3 changed files with 3 additions and 2 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -873,7 +873,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()) {