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

Commit d0d08382 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed the ordering of colorized media notifications" into oc-dev am: 37079af4 

am: 536eb852

Change-Id: I146e53c3ac3404f75909a564d62e905a4ca70a10
parents 61690a25 536eb852

services/core/java/com/android/server/notification/NotificationComparator.java

+3 −6
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ public class NotificationComparator 
    @Override

    public int compare(NotificationRecord left, NotificationRecord right) {

        // first all colorized notifications

        boolean leftImportantColorized = isImportantOngoingColorized(left);

        boolean rightImportantColorized = isImportantOngoingColorized(right);

        boolean leftImportantColorized = isImportantColorized(left);

        boolean rightImportantColorized = isImportantColorized(right);



        if (leftImportantColorized != rightImportantColorized) {

            return -1 * Boolean.compare(leftImportantColorized, rightImportantColorized);
@@ -117,10 +117,7 @@ public class NotificationComparator 
        return -1 * Long.compare(left.getRankingTimeMs(), right.getRankingTimeMs());

    }



    private boolean isImportantOngoingColorized(NotificationRecord record) {

        if (!isOngoing(record)) {

            return false;

        }

    private boolean isImportantColorized(NotificationRecord record) {

        if (record.getImportance() < NotificationManager.IMPORTANCE_LOW) {

            return false;

        }

services/tests/notification/src/com/android/server/notification/NotificationComparatorTest.java

+12 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class NotificationComparatorTest { 
    private NotificationRecord mRecordUrgent;

    private NotificationRecord mRecordCheater;

    private NotificationRecord mRecordCheaterColorized;



    private NotificationRecord mNoMediaSessionMedia;



    @Before

    public void setUp() {
@@ -124,7 +124,6 @@ public class NotificationComparatorTest { 
        Notification n3 = new Notification.Builder(mContext, TEST_CHANNEL_ID)

                .setStyle(new Notification.MediaStyle()

                        .setMediaSession(new MediaSession.Token(null)))

                .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)

                .build();

        mRecordDefaultMedia = new NotificationRecord(mContext, new StatusBarNotification(pkg2,

                pkg2, 1, "media", uid2, uid2, n3, new UserHandle(userId),
@@ -192,6 +191,16 @@ public class NotificationComparatorTest { 
                pkg2, 1, "cheater", uid2, uid2, n11, new UserHandle(userId),

                "", 9258), getDefaultChannel());

        mRecordCheaterColorized.setUserImportance(NotificationManager.IMPORTANCE_LOW);



        Notification n12 = new Notification.Builder(mContext, TEST_CHANNEL_ID)

                .setCategory(Notification.CATEGORY_MESSAGE)

                .setColorized(true)

                .setStyle(new Notification.MediaStyle())

                .build();

        mNoMediaSessionMedia = new NotificationRecord(mContext, new StatusBarNotification(

                pkg2, pkg2, 1, "cheater", uid2, uid2, n12, new UserHandle(userId),

                "", 9258), getDefaultChannel());

        mNoMediaSessionMedia.setUserImportance(NotificationManager.IMPORTANCE_DEFAULT);

    }



    @Test
@@ -205,6 +214,7 @@ public class NotificationComparatorTest { 
        expected.add(mRecordContact);

        expected.add(mRecordEmail);

        expected.add(mRecordUrgent);

        expected.add(mNoMediaSessionMedia);

        expected.add(mRecordCheater);

        expected.add(mRecordCheaterColorized);

        expected.add(mRecordMinCall);