Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1af769fb authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

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

parents e7401576 a18fcc15
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public class NotificationStackScrollLayoutController {
    private final NotificationLockscreenUserManager mLockscreenUserManager;
    // TODO: StatusBar should be encapsulated behind a Controller
    private final StatusBar mStatusBar;
    private final NotificationGroupManagerLegacy mLegacyGroupManager;
    private final SectionHeaderController mSilentHeaderController;
    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

@@ -651,6 +652,8 @@ public class NotificationStackScrollLayoutController {
                mStatusBar.requestNotificationUpdate("onGroupsChanged");
            }
        });
        mLegacyGroupManager = featureFlags.isNewNotifPipelineRenderingEnabled()
                ? null : legacyGroupManager;
        mSilentHeaderController = silentHeaderController;
        mFeatureFlags = featureFlags;
        mNotifPipeline = notifPipeline;
@@ -1193,9 +1196,13 @@ public class NotificationStackScrollLayoutController {
            final boolean inSection =
                    NotificationStackScrollLayout.matchesSelection(row, selection);
            if (matchClearable && inSection) {
                if (mLegacyGroupManager == null
                        || !mLegacyGroupManager.isSummaryOfSuppressedGroup(
                        row.getEntry().getSbn())) {
                    return true;
                }
            }
        }
        return false;
    }