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

Commit 9b2348b1 authored by Gus Prevas's avatar Gus Prevas
Browse files

Flips default for new interruption model setting to on. 

Test: manual
Change-Id: I74a9af24631f92c2a0f0d06145a40e1f8d1f209d
Fixes: 116622974
parent afafd66d

packages/ExtServices/src/android/ext/services/notification/Assistant.java

+2 −3
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ package android.ext.services.notification; 
import static android.app.NotificationManager.IMPORTANCE_LOW;

import static android.app.NotificationManager.IMPORTANCE_MIN;

import static android.service.notification.Adjustment.KEY_IMPORTANCE;

import static android.service.notification.NotificationListenerService.Ranking

        .USER_SENTIMENT_NEGATIVE;

import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -241,7 +240,7 @@ public class Assistant extends NotificationAssistantService { 
            signals.putCharSequenceArrayList(Adjustment.KEY_SMART_REPLIES, smartReplies);

        }

        if (Settings.Secure.getInt(getContentResolver(),

                Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL, 0) == 1) {

                Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL, 1) == 1) {

            if (mNotificationCategorizer.shouldSilence(entry)) {

                final int importance = entry.getImportance() < IMPORTANCE_LOW

                        ? entry.getImportance() : IMPORTANCE_LOW;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -75,6 +75,6 @@ public class NotificationUtils { 
    /** Returns the value of the new interruption model setting. */

    public static boolean useNewInterruptionModel(Context context) {

        return Settings.Secure.getInt(context.getContentResolver(),

                NOTIFICATION_NEW_INTERRUPTION_MODEL, 0) != 0;

                NOTIFICATION_NEW_INTERRUPTION_MODEL, 1) != 0;

    }

}

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

+14 −11
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.Notification;

import android.app.NotificationChannel;

import android.service.notification.StatusBarNotification;

import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;
@@ -35,6 +35,7 @@ import android.testing.ViewUtils; 
import android.view.ViewGroup;



import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.statusbar.notification.NotificationData;

import com.android.systemui.utils.leaks.LeakCheckedTest;



import org.junit.Before;
@@ -43,19 +44,26 @@ import org.junit.runner.RunWith; 
import org.mockito.Mockito;



@RunWith(AndroidTestingRunner.class)

@RunWithLooper()

@RunWithLooper(setAsMainLooper = true)

@SmallTest

public class NotificationMenuRowTest extends LeakCheckedTest {



    private ExpandableNotificationRow mRow;



    @Before

    public void setup() {

        injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES);

        mRow = mock(ExpandableNotificationRow.class);

        NotificationData.Entry entry = new NotificationData.Entry(

                mock(StatusBarNotification.class));

        entry.channel = mock(NotificationChannel.class);

        when(mRow.getEntry()).thenReturn(entry);

    }



    @Test

    public void testAttachDetach() {

        NotificationMenuRowPlugin row = new NotificationMenuRow(mContext);

        row.createMenu(null, null);

        row.createMenu(mRow, null);

        ViewUtils.attachView(row.getMenuView());

        TestableLooper.get(this).processAllMessages();

        ViewUtils.detachView(row.getMenuView());
@@ -65,9 +73,9 @@ public class NotificationMenuRowTest extends LeakCheckedTest { 
    @Test

    public void testRecreateMenu() {

        NotificationMenuRowPlugin row = new NotificationMenuRow(mContext);

        row.createMenu(null, null);

        row.createMenu(mRow, null);

        assertTrue(row.getMenuView() != null);

        row.createMenu(null, null);

        row.createMenu(mRow, null);

        assertTrue(row.getMenuView() != null);

    }
@@ -81,12 +89,7 @@ public class NotificationMenuRowTest extends LeakCheckedTest { 
    @Test

    public void testNoAppOpsInSlowSwipe() {

        NotificationMenuRow row = new NotificationMenuRow(mContext);

        Notification n = mock(Notification.class);

        StatusBarNotification sbn = mock(StatusBarNotification.class);

        when(sbn.getNotification()).thenReturn(n);

        ExpandableNotificationRow parent = mock(ExpandableNotificationRow.class);

        when(parent.getStatusBarNotification()).thenReturn(sbn);

        row.createMenu(parent, null);

        row.createMenu(mRow, null);



        ViewGroup container = (ViewGroup) row.getMenuView();

        // one for snooze and one for noti blocking