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

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

Merge "Make the alert button 'default' instead of 'high'"

parents 31e6a70c 9ae5e644

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
                    mChosenImportance = IMPORTANCE_LOW;

                    confirmationText.setText(R.string.notification_channel_silenced);

                } else {

                    mChosenImportance = IMPORTANCE_HIGH;

                    mChosenImportance = IMPORTANCE_DEFAULT;

                    confirmationText.setText(R.string.notification_channel_unsilenced);

                }

                break;

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.java

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.row; 


import static android.app.NotificationChannel.USER_LOCKED_IMPORTANCE;

import static android.app.NotificationManager.IMPORTANCE_DEFAULT;

import static android.app.NotificationManager.IMPORTANCE_HIGH;

import static android.app.NotificationManager.IMPORTANCE_LOW;

import static android.app.NotificationManager.IMPORTANCE_MIN;

import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -1067,7 +1066,7 @@ public class NotificationInfoTest extends SysuiTestCase { 
                anyString(), eq(TEST_UID), updated.capture());

        assertTrue((updated.getValue().getUserLockedFields()

                & USER_LOCKED_IMPORTANCE) != 0);

        assertEquals(IMPORTANCE_HIGH, updated.getValue().getImportance());

        assertEquals(IMPORTANCE_DEFAULT, updated.getValue().getImportance());

    }



    @Test
@@ -1111,7 +1110,7 @@ public class NotificationInfoTest extends SysuiTestCase { 
                anyString(), eq(TEST_UID), updated.capture());

        assertTrue((updated.getValue().getUserLockedFields()

                & USER_LOCKED_IMPORTANCE) != 0);

        assertEquals(IMPORTANCE_HIGH, updated.getValue().getImportance());

        assertEquals(IMPORTANCE_DEFAULT, updated.getValue().getImportance());

    }



    @Test