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

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

Merge "Advance notificationsDismissPrunedSummaries to nextfood by removing the flag." into main

parents 2bc3cf4f e20988bc

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -175,13 +175,6 @@ flag { 
    bug: "308623704"

}



flag {

    name: "notifications_dismiss_pruned_summaries"

    namespace: "systemui"

    description: "NotifCollection.dismissNotifications will now dismiss summaries that are pruned from the shade."

    bug: "355967751"

}



flag {

   name: "notification_transparent_header_fix"

   namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java

+0 −1
Original line number Diff line number Diff line
@@ -1383,7 +1383,6 @@ public class NotifCollectionTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_NOTIFICATIONS_DISMISS_PRUNED_SUMMARIES)

    public void testDismissNotificationsIncludesPrunedParents() {

        // GIVEN a collection with 2 groups; one has a single child, one has two.

        mCollection.addNotificationDismissInterceptor(mInterceptor1);

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java

+1 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import static android.service.notification.NotificationListenerService.REASON_TI 
import static android.service.notification.NotificationListenerService.REASON_UNAUTOBUNDLED;

import static android.service.notification.NotificationListenerService.REASON_USER_STOPPED;



import static com.android.systemui.Flags.notificationsDismissPrunedSummaries;

import static com.android.systemui.statusbar.notification.NotificationUtils.logKey;

import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.DISMISSED;

import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.NOT_DISMISSED;
@@ -278,9 +277,7 @@ public class NotifCollection implements Dumpable, PipelineDumpable { 
        Assert.isMainThread();

        checkForReentrantCall();



        if (notificationsDismissPrunedSummaries()) {

        entriesToDismiss = includeSummariesToDismiss(entriesToDismiss);

        }



        final int entryCount = entriesToDismiss.size();

        final List<NotificationEntry> entriesToLocallyDismiss = new ArrayList<>();