Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not count suppressed group summaries when checking for notifications." into sc-qpr1-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-09-24 18:26:01 +00:00
committed by Android (Google) Code Review
parent e7401576b0 a18fcc15ea
commit 1af769fb15
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
View File

@@ -171,6 +171,7 @@ public class NotificationStackScrollLayoutController {
private final NotificationLockscreenUserManager mLockscreenUserManager; private final NotificationLockscreenUserManager mLockscreenUserManager;
// TODO: StatusBar should be encapsulated behind a Controller // TODO: StatusBar should be encapsulated behind a Controller
private final StatusBar mStatusBar; private final StatusBar mStatusBar;
private final NotificationGroupManagerLegacy mLegacyGroupManager;
private final SectionHeaderController mSilentHeaderController; private final SectionHeaderController mSilentHeaderController;
private final LockscreenShadeTransitionController mLockscreenShadeTransitionController; private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
@@ -651,6 +652,8 @@ public class NotificationStackScrollLayoutController {
mStatusBar.requestNotificationUpdate("onGroupsChanged"); mStatusBar.requestNotificationUpdate("onGroupsChanged");
} }
}); });
mLegacyGroupManager = featureFlags.isNewNotifPipelineRenderingEnabled()
? null : legacyGroupManager;
mSilentHeaderController = silentHeaderController; mSilentHeaderController = silentHeaderController;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mNotifPipeline = notifPipeline; mNotifPipeline = notifPipeline;
@@ -1193,7 +1196,11 @@ public class NotificationStackScrollLayoutController {
final boolean inSection = final boolean inSection =
NotificationStackScrollLayout.matchesSelection(row, selection); NotificationStackScrollLayout.matchesSelection(row, selection);
if (matchClearable && inSection) { if (matchClearable && inSection) {
return true; if (mLegacyGroupManager == null
|| !mLegacyGroupManager.isSummaryOfSuppressedGroup(
row.getEntry().getSbn())) {
return true;
}
} }
} }
return false; return false;