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

Commit 55dade32 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Update notification FSI logic for when device is considered dreaming" into udc-dev

parents 180bfb00 236b845e

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ public interface StatusBarStateController { 
     */

    boolean isPulsing();



    /**

     * Is device dreaming. This method is more inclusive than

     * {@link android.service.dreams.IDreamManager.isDreaming}, as it will return true during the

     * dream's wake-up phase.

     */

    boolean isDreaming();



    /**

     * Adds a state listener

     */

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

+8 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController.StateList 
import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

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

import com.android.systemui.util.Compile;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -299,7 +300,7 @@ public class StatusBarStateControllerImpl implements 


    @Override

    public boolean setIsDreaming(boolean isDreaming) {

        if (Log.isLoggable(TAG, Log.DEBUG)) {

        if (Log.isLoggable(TAG, Log.DEBUG) || Compile.IS_DEBUG) {

            Log.d(TAG, "setIsDreaming:" + isDreaming);

        }

        if (mIsDreaming == isDreaming) {
@@ -320,6 +321,11 @@ public class StatusBarStateControllerImpl implements 
        return true;

    }



    @Override

    public boolean isDreaming() {

        return mIsDreaming;

    }



    @Override

    public void setAndInstrumentDozeAmount(View view, float dozeAmount, boolean animated) {

        if (mDarkAnimator != null && mDarkAnimator.isRunning()) {
@@ -580,6 +586,7 @@ public class StatusBarStateControllerImpl implements 
        pw.println(" mLeaveOpenOnKeyguardHide=" + mLeaveOpenOnKeyguardHide);

        pw.println(" mKeyguardRequested=" + mKeyguardRequested);

        pw.println(" mIsDozing=" + mIsDozing);

        pw.println(" mIsDreaming=" + mIsDreaming);

        pw.println(" mListeners{" + mListeners.size() + "}=");

        for (RankedListener rl : mListeners) {

            pw.println("    " + rl.mListener);

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+4 −18
Original line number Diff line number Diff line
@@ -28,12 +28,9 @@ import android.database.ContentObserver; 
import android.hardware.display.AmbientDisplayConfiguration;

import android.os.Handler;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.provider.Settings;

import android.service.dreams.IDreamManager;

import android.service.notification.StatusBarNotification;

import android.util.Log;



import androidx.annotation.NonNull;
@@ -70,7 +67,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
    private final KeyguardStateController mKeyguardStateController;

    private final ContentResolver mContentResolver;

    private final PowerManager mPowerManager;

    private final IDreamManager mDreamManager;

    private final AmbientDisplayConfiguration mAmbientDisplayConfiguration;

    private final BatteryController mBatteryController;

    private final HeadsUpManager mHeadsUpManager;
@@ -112,7 +108,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
    public NotificationInterruptStateProviderImpl(

            ContentResolver contentResolver,

            PowerManager powerManager,

            IDreamManager dreamManager,

            AmbientDisplayConfiguration ambientDisplayConfiguration,

            BatteryController batteryController,

            StatusBarStateController statusBarStateController,
@@ -126,7 +121,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            UserTracker userTracker) {

        mContentResolver = contentResolver;

        mPowerManager = powerManager;

        mDreamManager = dreamManager;

        mBatteryController = batteryController;

        mAmbientDisplayConfiguration = ambientDisplayConfiguration;

        mStatusBarStateController = statusBarStateController;
@@ -287,7 +281,9 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
        }



        // If the device is currently dreaming, then launch the FullScreenIntent

        if (isDreaming()) {

        // We avoid using IDreamManager#isDreaming here as that method will return false during

        // the dream's wake-up phase.

        if (mStatusBarStateController.isDreaming()) {

            return getDecisionGivenSuppression(FullScreenIntentDecision.FSI_DEVICE_IS_DREAMING,

                    suppressedByDND);

        }
@@ -365,16 +361,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
                }

        }

    }



    private boolean isDreaming() {

        try {

            return mDreamManager.isDreaming();

        } catch (RemoteException e) {

            Log.e(TAG, "Failed to query dream manager.", e);

            return false;

        }

    }



    private boolean shouldHeadsUpWhenAwake(NotificationEntry entry, boolean log) {

        StatusBarNotification sbn = entry.getSbn();
@@ -424,7 +410,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
            return false;

        }



        boolean inUse = mPowerManager.isScreenOn() && !isDreaming();

        boolean inUse = mPowerManager.isScreenOn() && !mStatusBarStateController.isDreaming();



        if (!inUse) {

            if (log) mLogger.logNoHeadsUpNotInUse(entry);

packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt

+9 −0
Original line number Diff line number Diff line
@@ -167,4 +167,13 @@ class StatusBarStateControllerImplTest : SysuiTestCase() { 
        controller.setIsDreaming(false)

        verify(listener).onDreamingChanged(false)

    }



    @Test

    fun testSetDreamState_getterReturnsCurrentState() {

        controller.setIsDreaming(true)

        assertTrue(controller.isDreaming())



        controller.setIsDreaming(false)

        assertFalse(controller.isDreaming())

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java

+18 −22
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import android.hardware.display.AmbientDisplayConfiguration; 
import android.os.Handler;

import android.os.PowerManager;

import android.os.RemoteException;

import android.service.dreams.IDreamManager;

import android.testing.AndroidTestingRunner;



import androidx.test.filters.SmallTest;
@@ -94,8 +93,6 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    @Mock

    PowerManager mPowerManager;

    @Mock

    IDreamManager mDreamManager;

    @Mock

    AmbientDisplayConfiguration mAmbientDisplayConfiguration;

    @Mock

    StatusBarStateController mStatusBarStateController;
@@ -133,7 +130,6 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
                new NotificationInterruptStateProviderImpl(

                        mContext.getContentResolver(),

                        mPowerManager,

                        mDreamManager,

                        mAmbientDisplayConfiguration,

                        mBatteryController,

                        mStatusBarStateController,
@@ -157,7 +153,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        when(mHeadsUpManager.isSnoozed(any())).thenReturn(false);



        when(mStatusBarStateController.isDozing()).thenReturn(false);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mPowerManager.isScreenOn()).thenReturn(true);

    }
@@ -359,7 +355,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 


        // Also not in use if screen is on but we're showing screen saver / "dreaming"

        when(mPowerManager.isDeviceIdleMode()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(true);

        when(mStatusBarStateController.isDreaming()).thenReturn(true);

        assertThat(mNotifInterruptionStateProvider.shouldHeadsUp(entry)).isFalse();

    }
@@ -539,7 +535,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    public void testShouldNotFullScreen_notPendingIntent() throws RemoteException {

        NotificationEntry entry = createNotification(IMPORTANCE_HIGH);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -558,7 +554,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
                .setSuppressedVisualEffects(SUPPRESSED_EFFECT_FULL_SCREEN_INTENT)

                .build();

        when(mPowerManager.isInteractive()).thenReturn(false);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -577,7 +573,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
                .setSuppressedVisualEffects(SUPPRESSED_EFFECT_FULL_SCREEN_INTENT)

                .build();

        when(mPowerManager.isInteractive()).thenReturn(false);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -599,7 +595,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    public void testShouldNotFullScreen_notHighImportance() throws RemoteException {

        NotificationEntry entry = createFsiNotification(IMPORTANCE_DEFAULT, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -621,7 +617,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    public void testShouldNotFullScreen_isGroupAlertSilenced() throws RemoteException {

        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ true);

        when(mPowerManager.isInteractive()).thenReturn(false);

        when(mDreamManager.isDreaming()).thenReturn(true);

        when(mStatusBarStateController.isDreaming()).thenReturn(true);

        when(mStatusBarStateController.getState()).thenReturn(KEYGUARD);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -651,7 +647,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    public void testShouldFullScreen_notInteractive() throws RemoteException {

        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(false);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -673,7 +669,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    public void testShouldFullScreen_isDreaming() throws RemoteException {

        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(true);

        when(mStatusBarStateController.isDreaming()).thenReturn(true);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -695,7 +691,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
    public void testShouldFullScreen_onKeyguard() throws RemoteException {

        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(KEYGUARD);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -718,7 +714,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);



        assertThat(mNotifInterruptionStateProvider.getFullScreenIntentDecision(entry))
@@ -735,7 +731,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);
@@ -754,7 +750,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);
@@ -775,7 +771,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);
@@ -800,7 +796,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE_LOCKED);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);
@@ -821,7 +817,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE_LOCKED);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);
@@ -846,7 +842,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(false);
@@ -892,7 +888,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase { 
        NotificationEntry entry = createFsiNotification(IMPORTANCE_HIGH, /* silenced */ false);

        when(mPowerManager.isInteractive()).thenReturn(true);

        when(mPowerManager.isScreenOn()).thenReturn(true);

        when(mDreamManager.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.isDreaming()).thenReturn(false);

        when(mStatusBarStateController.getState()).thenReturn(SHADE);

        when(mHeadsUpManager.isSnoozed("a")).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(false);