summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2016-12-19 14:26:51 -0800
committer Adrian Roos <roosa@google.com> 2016-12-20 20:17:36 +0000
commite5726a20824c3cb2ff369207c8d75bfcdb814f69 (patch)
tree058623e5a8d0df9a9c4cd175e25dcc2981abcd3e
parent52a9e0e1ddef258b3d18f901fb9a7884a244ac39 (diff)
Ambient Display: Fix race with coloring and redaction
Fixes a bug that could result in a notification being colored on ambient display when redaction is enabled. Only the showing layout (either redacted or regular) was be set to dark. If the showing layout changed after the darkness changed, the newly showing layout was not properly darkened. Change-Id: I0930ebe8007634ee92e104573294b5c27f1bad82 Fixes: 33429653 Test: Enable redacted notificationsn on lockscreen, enter ambient, verify that notifications are gray.
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index caf5447d9d26..c19dc22b4f8a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -1346,6 +1346,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
NotificationContentView showingLayout = getShowingLayout();
showingLayout.updateBackgroundColor(animated);
mPrivateLayout.updateExpandButtons(isExpandable());
+ showingLayout.setDark(isDark(), false /* animate */, 0 /* delay */);
mShowingPublicInitialized = true;
}