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

Commit b6f9caac authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Populate buckets to ensure correct corner rounds on notifications am: 4ddf9d09 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150890

Change-Id: Ifa19762abfd1bd11499311e528167fdc069c8c36
parents 8ebb9d33 4ddf9d09

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ import static android.app.Notification.VISIBILITY_SECRET; 
import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED;



import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManagerKt.BUCKET_MEDIA_CONTROLS;

import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManagerKt.BUCKET_SILENT;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_MEDIA_CONTROLS;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_SILENT;



import android.app.ActivityManager;

import android.app.KeyguardManager;

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; 
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;



import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_NOT_CANCELED;

import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManagerKt.BUCKET_ALERTING;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_ALERTING;



import static java.util.Objects.requireNonNull;

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

+18 −9
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.plugga 
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifStabilityManager;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.Pluggable;

import com.android.systemui.statusbar.notification.collection.notifcollection.CollectionReadyForBuildListener;

import com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt;

import com.android.systemui.util.Assert;

import com.android.systemui.util.time.SystemClock;
@@ -738,7 +739,7 @@ public class ShadeListBuilder implements Dumpable { 
            if (entry instanceof GroupEntry) {

                GroupEntry parent = (GroupEntry) entry;

                for (NotificationEntry child : parent.getChildren()) {

                    child.getAttachState().setSection(section);

                    setEntrySection(child, section);

                }

                parent.sortChildren(sChildComparator);

            }
@@ -957,10 +958,18 @@ public class ShadeListBuilder implements Dumpable { 
            }

        }



        entry.getAttachState().setSection(finalSection);

        setEntrySection(entry, finalSection);

        return finalSection;

    }



    private void setEntrySection(ListEntry entry, NotifSection finalSection) {

        entry.getAttachState().setSection(finalSection);

        NotificationEntry representativeEntry = entry.getRepresentativeEntry();

        if (representativeEntry != null && finalSection != null) {

            representativeEntry.setBucket(finalSection.getBucket());

        }

    }



    @NonNull

    private NotifSection findSection(ListEntry entry) {

        for (int i = 0; i < mNotifSections.size(); i++) {
@@ -1039,8 +1048,8 @@ public class ShadeListBuilder implements Dumpable { 
        void onRenderList(@NonNull List<ListEntry> entries);

    }



    private static final NotifSectioner DEFAULT_SECTIONER =

            new NotifSectioner("UnknownSection") {

    private static final NotifSectioner DEFAULT_SECTIONER = new NotifSectioner("UnknownSection",

            NotificationPriorityBucketKt.BUCKET_UNKNOWN) {

        @Override

        public boolean isInSection(ListEntry entry) {

            return true;

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

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.statusbar.notification.collection.NotifPipeline; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner;

import com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt;

import com.android.systemui.util.concurrency.DelayableExecutor;



import javax.inject.Inject;
@@ -102,7 +103,8 @@ public class AppOpsCoordinator implements Coordinator { 
    /**

     * Puts foreground service notifications into its own section.

     */

    private final NotifSectioner mNotifSectioner = new NotifSectioner("ForegroundService") {

    private final NotifSectioner mNotifSectioner = new NotifSectioner("ForegroundService",

            NotificationPriorityBucketKt.BUCKET_FOREGROUND_SERVICE) {

        @Override

        public boolean isInSection(ListEntry entry) {

            NotificationEntry notificationEntry = entry.getRepresentativeEntry();

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.statusbar.notification.collection.render.NodeControl 
import com.android.systemui.statusbar.notification.dagger.PeopleHeader

import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier

import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_NON_PERSON

import com.android.systemui.statusbar.notification.stack.BUCKET_PEOPLE

import javax.inject.Inject



/**
@@ -45,7 +46,7 @@ class ConversationCoordinator @Inject constructor( 
        }

    }



    val sectioner = object : NotifSectioner("People") {

    val sectioner = object : NotifSectioner("People", BUCKET_PEOPLE) {

        override fun isInSection(entry: ListEntry): Boolean =

                isConversation(entry.representativeEntry!!)

        override fun getHeaderNodeController() =