From 0149739cb290c8af3715ad40f8f3252be4271935 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Thu, 23 May 2019 11:22:23 -0700 Subject: [PATCH] Fixed an issue where notification groups could be empty Because we were looking at the theoretical and not the actual showing public state, notifications could get updated to invisible without ever recovering. The actual showingPublic state now determins the visibility. Fixes: 117272628 Test: add low priority child while group is on lockscreen and invisible Change-Id: Iacdd984451a2e3d69a0aaa8186b6afab5447188e --- .../statusbar/notification/row/ExpandableNotificationRow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index d731ba60fa647..7179ec9b1faf3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -2021,10 +2021,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private void updateChildrenVisibility() { boolean hideContentWhileLaunching = mExpandAnimationRunning && mGuts != null && mGuts.isExposed(); - mPrivateLayout.setVisibility(!shouldShowPublic() && !mIsSummaryWithChildren + mPrivateLayout.setVisibility(!mShowingPublic && !mIsSummaryWithChildren && !hideContentWhileLaunching ? VISIBLE : INVISIBLE); if (mChildrenContainer != null) { - mChildrenContainer.setVisibility(!shouldShowPublic() && mIsSummaryWithChildren + mChildrenContainer.setVisibility(!mShowingPublic && mIsSummaryWithChildren && !hideContentWhileLaunching ? VISIBLE : INVISIBLE); }