From e5726a20824c3cb2ff369207c8d75bfcdb814f69 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 19 Dec 2016 14:26:51 -0800 Subject: 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. --- .../src/com/android/systemui/statusbar/ExpandableNotificationRow.java | 1 + 1 file changed, 1 insertion(+) 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; } -- cgit v1.2.3-59-g8ed1b