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

Commit ed0ecfcb authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Create old or new provider based on flag 

Bug: 261728888
Test: builds and boots
Flag: ACONFIG com.android.systemui.visual_interruptions_refactor DEVELOPMENT
Change-Id: Ie839df40dde0ae313356dbba2cc7700ccd37fd38
parent 669608e6

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −9
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ import com.android.systemui.statusbar.notification.collection.inflation.Notifica 
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;

import com.android.systemui.statusbar.notification.people.PeopleHubModule;

import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent;
@@ -374,11 +372,4 @@ public abstract class SystemUIModule { 
    @Binds

    abstract LargeScreenShadeInterpolator largeScreensShadeInterpolator(

            LargeScreenShadeInterpolatorImpl impl);



    @SysUISingleton

    @Provides

    static VisualInterruptionDecisionProvider provideVisualInterruptionDecisionProvider(

            NotificationInterruptStateProvider innerProvider) {

        return new NotificationInterruptStateProviderWrapper(innerProvider);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java

+24 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ import com.android.systemui.statusbar.notification.init.NotificationsControllerS 
import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProviderModule;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderImpl;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProviderImpl;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.logging.NotificationPanelLogger;

import com.android.systemui.statusbar.notification.logging.NotificationPanelLoggerImpl;
@@ -268,4 +272,24 @@ public interface NotificationsModule { 
    /** */

    @Binds

    NotifLiveDataStore bindNotifLiveDataStore(NotifLiveDataStoreImpl notifLiveDataStoreImpl);



    /** */

    @Provides

    @SysUISingleton

    static VisualInterruptionDecisionProvider provideVisualInterruptionDecisionProvider(

            Provider<NotificationInterruptStateProviderImpl> oldImplProvider,

            Provider<VisualInterruptionDecisionProviderImpl> newImplProvider) {

        if (VisualInterruptionRefactor.isEnabled()) {

            return newImplProvider.get();

        } else {

            return new NotificationInterruptStateProviderWrapper(oldImplProvider.get());

        }

    }



    /** */

    @Binds

    @IntoMap

    @ClassKey(VisualInterruptionDecisionProvider.class)

    CoreStartable startVisualInterruptionDecisionProvider(

            VisualInterruptionDecisionProvider provider);

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProvider.kt

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



import com.android.internal.annotations.VisibleForTesting

import com.android.systemui.CoreStartable

import com.android.systemui.statusbar.notification.collection.NotificationEntry



/**
@@ -26,7 +27,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry 
 * pulsing while the device is dozing), displaying the notification as a bubble, and launching a

 * full-screen intent for the notification.

 */

interface VisualInterruptionDecisionProvider {

interface VisualInterruptionDecisionProvider : CoreStartable {

    /**

     * Represents the decision to visually interrupt or not.

     *
@@ -53,7 +54,7 @@ interface VisualInterruptionDecisionProvider { 
    }



    /** Initializes the provider. */

    fun start() {}

    override fun start() {}



    /**

     * Adds a [NotificationInterruptSuppressor] that can suppress visual interruptions.

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ import com.android.systemui.statusbar.notification.NotificationActivityStarter; 
import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;

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

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor;
@@ -458,7 +458,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private final NotificationGutsManager mGutsManager;

    private final ShadeExpansionStateManager mShadeExpansionStateManager;

    private final KeyguardViewMediator mKeyguardViewMediator;

    protected final NotificationInterruptStateProvider mNotificationInterruptStateProvider;

    private final VisualInterruptionDecisionProvider mVisualInterruptionDecisionProvider;

    private final BrightnessSliderController.Factory mBrightnessSliderFactory;

    private final FeatureFlags mFeatureFlags;

    private final FragmentService mFragmentService;
@@ -619,7 +619,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            FalsingCollector falsingCollector,

            BroadcastDispatcher broadcastDispatcher,

            NotificationGutsManager notificationGutsManager,

            NotificationInterruptStateProvider notificationInterruptStateProvider,

            VisualInterruptionDecisionProvider visualInterruptionDecisionProvider,

            ShadeExpansionStateManager shadeExpansionStateManager,

            KeyguardViewMediator keyguardViewMediator,

            DisplayMetrics displayMetrics,
@@ -726,7 +726,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mFalsingManager = falsingManager;

        mBroadcastDispatcher = broadcastDispatcher;

        mGutsManager = notificationGutsManager;

        mNotificationInterruptStateProvider = notificationInterruptStateProvider;

        mVisualInterruptionDecisionProvider = visualInterruptionDecisionProvider;

        mShadeExpansionStateManager = shadeExpansionStateManager;

        mKeyguardViewMediator = keyguardViewMediator;

        mDisplayMetrics = displayMetrics;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+23 −116
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.statusbar.phone;



import static android.app.NotificationManager.IMPORTANCE_HIGH;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;

import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;

import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.provider.Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED;
@@ -27,13 +25,9 @@ import static com.android.systemui.Flags.FLAG_LIGHT_REVEAL_MIGRATION; 
import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.StatusBarState.SHADE;



import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doAnswer;
@@ -49,8 +43,6 @@ import static java.util.Collections.emptySet; 


import android.app.ActivityManager;

import android.app.IWallpaperManager;

import android.app.Notification;

import android.app.NotificationChannel;

import android.app.WallpaperManager;

import android.app.trust.TrustManager;

import android.content.BroadcastReceiver;
@@ -158,13 +150,13 @@ import com.android.systemui.statusbar.notification.NotificationActivityStarter; 
import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorControllerProvider;

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

import com.android.systemui.statusbar.notification.collection.NotifLiveDataStore;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.init.NotificationsController;

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptLogger;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderImpl;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

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

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
@@ -219,7 +211,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    private CentralSurfacesImpl mCentralSurfaces;

    private FakeMetricsLogger mMetricsLogger;

    private PowerManager mPowerManager;

    private TestableNotificationInterruptStateProviderImpl mNotificationInterruptStateProvider;

    private VisualInterruptionDecisionProvider mVisualInterruptionDecisionProvider;



    @Mock private NotificationsController mNotificationsController;

    @Mock private LightBarController mLightBarController;
@@ -362,7 +354,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 


        mFakeGlobalSettings.putInt(HEADS_UP_NOTIFICATIONS_ENABLED, HEADS_UP_ON);



        mNotificationInterruptStateProvider =

        mVisualInterruptionDecisionProvider =

                new NotificationInterruptStateProviderWrapper(

                        new TestableNotificationInterruptStateProviderImpl(

                                mPowerManager,

                                mAmbientDisplayConfiguration,
@@ -379,7 +372,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                                mDeviceProvisionedController,

                                mFakeSystemClock,

                                mFakeGlobalSettings,

                        mFakeEventLog);

                                mFakeEventLog));



        mContext.addMockSystemService(TrustManager.class, mock(TrustManager.class));

        mContext.addMockSystemService(FingerprintManager.class, mock(FingerprintManager.class));
@@ -482,7 +475,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                new FalsingCollectorFake(),

                mBroadcastDispatcher,

                mNotificationGutsManager,

                mNotificationInterruptStateProvider,

                mVisualInterruptionDecisionProvider,

                new ShadeExpansionStateManager(),

                mKeyguardViewMediator,

                new DisplayMetrics(),
@@ -692,92 +685,6 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                        .setSubtype(1));

    }



    @Test

    public void testShouldHeadsUp_nonSuppressedGroupSummary() throws Exception {

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

        when(mHeadsUpManager.isSnoozed(anyString())).thenReturn(false);

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



        Notification n = new Notification.Builder(getContext(), "a")

                .setGroup("a")

                .setGroupSummary(true)

                .setGroupAlertBehavior(Notification.GROUP_ALERT_SUMMARY)

                .build();



        NotificationEntry entry = new NotificationEntryBuilder()

                .setPkg("a")

                .setOpPkg("a")

                .setTag("a")

                .setNotification(n)

                .setImportance(IMPORTANCE_HIGH)

                .build();



        assertTrue(mNotificationInterruptStateProvider.shouldHeadsUp(entry));

    }



    @Test

    public void testShouldHeadsUp_suppressedGroupSummary() throws Exception {

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

        when(mHeadsUpManager.isSnoozed(anyString())).thenReturn(false);

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



        Notification n = new Notification.Builder(getContext(), "a")

                .setGroup("a")

                .setGroupSummary(true)

                .setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN)

                .build();



        NotificationEntry entry = new NotificationEntryBuilder()

                .setPkg("a")

                .setOpPkg("a")

                .setTag("a")

                .setNotification(n)

                .setImportance(IMPORTANCE_HIGH)

                .build();



        assertFalse(mNotificationInterruptStateProvider.shouldHeadsUp(entry));

    }



    @Test

    public void testShouldHeadsUp_suppressedHeadsUp() throws Exception {

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

        when(mHeadsUpManager.isSnoozed(anyString())).thenReturn(false);

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



        Notification n = new Notification.Builder(getContext(), "a").build();



        NotificationEntry entry = new NotificationEntryBuilder()

                .setPkg("a")

                .setOpPkg("a")

                .setTag("a")

                .setChannel(new NotificationChannel("id", null, IMPORTANCE_HIGH))

                .setNotification(n)

                .setImportance(IMPORTANCE_HIGH)

                .setSuppressedVisualEffects(SUPPRESSED_EFFECT_PEEK)

                .build();



        assertFalse(mNotificationInterruptStateProvider.shouldHeadsUp(entry));

    }



    @Test

    public void testShouldHeadsUp_noSuppressedHeadsUp() throws Exception {

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

        when(mHeadsUpManager.isSnoozed(anyString())).thenReturn(false);

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



        Notification n = new Notification.Builder(getContext(), "a").build();



        NotificationEntry entry = new NotificationEntryBuilder()

                .setPkg("a")

                .setOpPkg("a")

                .setTag("a")

                .setNotification(n)

                .setImportance(IMPORTANCE_HIGH)

                .build();



        assertTrue(mNotificationInterruptStateProvider.shouldHeadsUp(entry));

    }



    @Test

    public void testDump_DoesNotCrash() {

        mCentralSurfaces.dump(new PrintWriter(new ByteArrayOutputStream()), null);