commit fe84e1f436ad14b1f24cdb9b8bf56a9919f25c93
author Adrian Roos <roosa@google.com> Wed Nov 04 15:55:39 2015 -0800
committer Adrian Roos <roosa@google.com> Mon Nov 23 20:07:49 2015 +0000
tree dd4376d1e56325a74713317d6d247a24caaa5e1d
parent a87401054fc6960c4b0ac2d361ddbcf415350b33

Visuals for Inline Reply

Change-Id: I374a7ec82795f95fe2f3ce8c9e6b02c1479433af

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0b77be3..af990de 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3311,12 +3311,17 @@
                     tombstone ? getActionTombstoneLayoutResource()
                               : getActionLayoutResource());
             final Icon ai = action.getIcon();
-            button.setTextViewCompoundDrawablesRelative(R.id.action0, ai, null, null, null);
             button.setTextViewText(R.id.action0, processLegacyText(action.title));
             if (!tombstone) {
                 button.setOnClickPendingIntent(R.id.action0, action.actionIntent);
             }
             button.setContentDescription(R.id.action0, action.title);
+            if (action.mRemoteInputs != null) {
+                button.setRemoteInputs(R.id.action0, action.mRemoteInputs);
+            }
+            if (mN.color != COLOR_DEFAULT) {
+                button.setTextColor(R.id.action0, mN.color);
+            }
             processLegacyAction(action, button);
             return button;
         }