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

Commit b4f3897b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I4d1d38ea,Ibd3f73bc,Ic476fbb0 into rvc-dev am: 2a952d33 

Change-Id: I967f886e52c6cfedb9acfcca4904c79c2d6db9d7
parents 7c6e121c 2a952d33

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.NotificationSectionsManager.BUCKET_MEDIA_CONTROLS;

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

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

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



import android.app.ActivityManager;

import android.app.KeyguardManager;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt

+6 −6
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ import android.provider.DeviceConfig 


import com.android.internal.annotations.VisibleForTesting

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NOTIFICATIONS_USE_PEOPLE_FILTERING

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_FOREGROUND_SERVICE

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_HEADS_UP

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_MEDIA_CONTROLS

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

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_SILENT

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

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

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

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

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

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

import com.android.systemui.util.DeviceConfigProxy

import com.android.systemui.util.Utils

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

+4 −4
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.NotificationSectionsManager.BUCKET_ALERTING;

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



import static java.util.Objects.requireNonNull;
@@ -68,7 +68,7 @@ import com.android.systemui.statusbar.notification.icon.IconPack; 
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRowController;

import com.android.systemui.statusbar.notification.row.NotificationGuts;

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

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



import java.util.ArrayList;

import java.util.List;
@@ -409,12 +409,12 @@ public final class NotificationEntry extends ListEntry { 
        return wasBubble != isBubble();

    }



    @NotificationSectionsManager.PriorityBucket

    @PriorityBucket

    public int getBucket() {

        return mBucket;

    }



    public void setBucket(@NotificationSectionsManager.PriorityBucket int bucket) {

    public void setBucket(@PriorityBucket int bucket) {

        mBucket = bucket;

    }

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

+6 −22
Original line number Diff line number Diff line
@@ -28,12 +28,11 @@ import com.android.systemui.statusbar.notification.NotificationSectionsFeatureMa 
import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider

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.NotificationSectionsManager.BUCKET_ALERTING

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_FOREGROUND_SERVICE

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_HEADS_UP

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

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_SILENT

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.PriorityBucket

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

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

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

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

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

import com.android.systemui.statusbar.phone.NotificationGroupManager

import com.android.systemui.statusbar.policy.HeadsUpManager

import dagger.Lazy
@@ -138,23 +137,8 @@ open class NotificationRankingManager @Inject constructor( 
                .filterNot(notifFilter::shouldFilterOut)

                .sortedWith(rankingComparator)

                .toList()

        assignBuckets(filtered)

        return filtered

    }



    private fun assignBuckets(entries: List<NotificationEntry>) {

        entries.forEach { it.bucket = getBucketForEntry(it) }

        if (!usePeopleFiltering) {

            // If we don't have a Conversation section, just assign buckets normally based on the

            // content.

            return

        }

        // If HUNs are not continuous with the top section, break out into a new Incoming section.

        entries.asReversed().asSequence().zipWithNext().forEach { (next, entry) ->

            if (entry.isRowHeadsUp && entry.bucket > next.bucket) {

                entry.bucket = BUCKET_HEADS_UP

            }

        }

        return filtered

    }



    @PriorityBucket

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSection.java

+4 −4
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import com.android.systemui.statusbar.notification.row.ActivatableNotificationVi 
 * Represents the bounds of a section of the notification shade and handles animation when the

 * bounds change.

 */

class NotificationSection {

    private @NotificationSectionsManager.PriorityBucket int mBucket;

public class NotificationSection {

    private @PriorityBucket int mBucket;

    private View mOwningView;

    private Rect mBounds = new Rect();

    private Rect mCurrentBounds = new Rect(-1, -1, -1, -1);
@@ -44,7 +44,7 @@ class NotificationSection { 
    private ActivatableNotificationView mFirstVisibleChild;

    private ActivatableNotificationView mLastVisibleChild;



    NotificationSection(View owningView, @NotificationSectionsManager.PriorityBucket int bucket) {

    NotificationSection(View owningView, @PriorityBucket int bucket) {

        mOwningView = owningView;

        mBucket = bucket;

    }
@@ -74,7 +74,7 @@ class NotificationSection { 
        return mBottomAnimator != null || mTopAnimator != null;

    }



    @NotificationSectionsManager.PriorityBucket

    @PriorityBucket

    public int getBucket() {

        return mBucket;

    }