summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-05-30 01:29:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-05-30 01:29:40 +0000
commit1c6b8095797818445f97f0a63d2d09636e55860a (patch)
tree3b337600fea6013f08e58cb1b08a4d1384deb4fe
parentd982210d8986c4387b4b8f31ed5f9950bdc5a155 (diff)
parent27732cc0db32239feac8cbb0be4ff19a6440e8c7 (diff)
Merge "Fixed an issue where the reply icon was disabled" into pi-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java3
1 files changed, 3 insertions, 0 deletions
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 03791c7f91ea..91a4dda5a281 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 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp
}
}
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);