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

Commit 8ed2c7f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iaeb8d9c2,Ifa83ce1d 

* changes:
  Fix notification sorting.
  Remove all caps style
parents 3a7684cc 472f01cf

packages/SystemUI/res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ 
    <style name="TextAppearance.NotificationInfo.Button">

        <item name="android:fontFamily">sans-serif-medium</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textAllCaps">true</item>

        <item name="android:textColor">?android:attr/colorAccent</item>

        <item name="android:background">@drawable/btn_borderless_rect</item>

        <item name="android:gravity">center</item>

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

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class NotificationComparator 
    }



    private boolean isCall(NotificationRecord record) {

        return record.getNotification().category == Notification.CATEGORY_CALL

        return record.isCategory(Notification.CATEGORY_CALL)

                && isDefaultPhoneApp(record.sbn.getPackageName());

    }

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

+24 −2
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ public class NotificationComparatorTest extends UiServiceTestCase { 
    private NotificationRecord mRecordCheater;

    private NotificationRecord mRecordCheaterColorized;

    private NotificationRecord mNoMediaSessionMedia;

    private NotificationRecord mRecordColorized;

    private NotificationRecord mRecordColorizedCall;



    @Before

    public void setUp() {
@@ -113,7 +115,6 @@ public class NotificationComparatorTest extends UiServiceTestCase { 
        Notification n2 = new Notification.Builder(mContext, TEST_CHANNEL_ID)

                .setCategory(Notification.CATEGORY_CALL)

                .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)

                .setColorized(true /* colorized */)

                .build();

        mRecordHighCall = new NotificationRecord(mContext, new StatusBarNotification(callPkg,

                callPkg, 1, "highcall", callUid, callUid, n2,
@@ -200,13 +201,34 @@ public class NotificationComparatorTest extends UiServiceTestCase { 
                pkg2, pkg2, 1, "cheater", uid2, uid2, n12, new UserHandle(userId),

                "", 9258), getDefaultChannel());

        mNoMediaSessionMedia.setUserImportance(NotificationManager.IMPORTANCE_DEFAULT);



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

                .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)

                .setColorized(true /* colorized */)

                .build();

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

                pkg2, 1, "colorized", uid2, uid2, n13,

                new UserHandle(userId), "", 1999), getDefaultChannel());

        mRecordHighCall.setUserImportance(NotificationManager.IMPORTANCE_HIGH);



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

                .setCategory(Notification.CATEGORY_CALL)

                .setColorized(true)

                .setFlag(Notification.FLAG_FOREGROUND_SERVICE, true)

                .build();

        mRecordColorizedCall = new NotificationRecord(mContext, new StatusBarNotification(callPkg,

                callPkg, 1, "colorizedCall", callUid, callUid, n14,

                new UserHandle(userId), "", 1999), getDefaultChannel());

        mRecordColorizedCall.setUserImportance(NotificationManager.IMPORTANCE_HIGH);

    }



    @Test

    public void testOrdering() throws Exception {

        final List<NotificationRecord> expected = new ArrayList<>();

        expected.add(mRecordHighCall);

        expected.add(mRecordColorizedCall);

        expected.add(mRecordDefaultMedia);

        expected.add(mRecordColorized);

        expected.add(mRecordHighCall);

        expected.add(mRecordInlineReply);

        expected.add(mRecordSms);

        expected.add(mRecordStarredContact);