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

Commit 627ad378 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Show DND icon on AOD whenever DND is on 

Before, we'd only show it if visual effects were off, and users
didn't quite understand the behavior.

Test: manually toggle DND
Test: atest KeyguardSliceProviderTest
Bug: 111405682
Change-Id: I305883564c8d710497a5fc9a8ca0548c30b896f0
parent 211af382

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java

+4 −8
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.keyguard; 


import android.app.ActivityManager;

import android.app.AlarmManager;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;
@@ -175,7 +174,7 @@ public class KeyguardSliceProvider extends SliceProvider implements 
     * @param builder The slice builder.

     */

    protected void addZenMode(ListBuilder builder) {

        if (!isDndSuppressingNotifications()) {

        if (!isDndOn()) {

            return;

        }

        RowBuilder dndBuilder = new RowBuilder(mDndUri)
@@ -187,13 +186,10 @@ public class KeyguardSliceProvider extends SliceProvider implements 
    }



    /**

     * Return true if DND is enabled suppressing notifications.

     * Return true if DND is enabled.

     */

    protected boolean isDndSuppressingNotifications() {

        boolean suppressingNotifications = (mZenModeController.getConfig().suppressedVisualEffects

                & NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST) != 0;

        return mZenModeController.getZen() != Settings.Global.ZEN_MODE_OFF

                && suppressingNotifications;

    protected boolean isDndOn() {

        return mZenModeController.getZen() != Settings.Global.ZEN_MODE_OFF;

    }



    @Override

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardSliceProviderTest.java

+8 −12
Original line number Diff line number Diff line
@@ -19,11 +19,9 @@ package com.android.systemui.keyguard; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.AlarmManager;

import android.content.ContentResolver;
@@ -34,10 +32,15 @@ import android.support.test.filters.SmallTest; 
import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;

import android.util.Log;



import androidx.slice.Slice;

import androidx.slice.SliceItem;

import androidx.slice.SliceProvider;

import androidx.slice.SliceSpecs;

import androidx.slice.builders.ListBuilder;

import androidx.slice.core.SliceQuery;



import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.policy.ZenModeController;



import org.junit.Assert;

import org.junit.Before;
@@ -50,13 +53,6 @@ import java.util.Arrays; 
import java.util.HashSet;

import java.util.concurrent.TimeUnit;



import androidx.slice.Slice;

import androidx.slice.SliceItem;

import androidx.slice.SliceProvider;

import androidx.slice.SliceSpecs;

import androidx.slice.builders.ListBuilder;

import androidx.slice.core.SliceQuery;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWithLooper(setAsMainLooper = true)
@@ -164,7 +160,7 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
        }



        @Override

        protected boolean isDndSuppressingNotifications() {

        protected boolean isDndOn() {

            return mIsZenMode;

        }