commit 684f5ffc34ccd8d6c360cd99e2dbb4513dd007e2
author Selim Cinek <cinek@google.com> Tue May 29 19:04:43 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 19:04:43 2018 -0700
tree 00de929ac429ff7d11c4685b01c241f10814ef46
parent 0fc5e5202357d47b7e560746f172c85c7bb2d706
parent 1c6b8095797818445f97f0a63d2d09636e55860a

Merge "Fixed an issue where the reply icon was disabled" into pi-dev
am: 1c6b809579

Change-Id: Ib9593bdbf872a9146a877b3ec22c101001b2ad13

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
index 03791c7..91a4dda 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
@@ -182,6 +182,9 @@
             }
         }
         if (mReplyAction != null) {
+            // Let's reset the view on update, assuming the new pending intent isn't cancelled
+            // anymore. The color filter automatically resets when it's updated.
+            mReplyAction.setEnabled(true);
             performOnPendingIntentCancellation(mReplyAction, () -> {
                 if (mReplyAction != null && mReplyAction.isEnabled()) {
                     mReplyAction.setEnabled(false);