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

Commit a9dfd48a authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hidenisp" into main 

* changes:
  Create old or new provider based on flag
  Remove obsolete usages of NotificationInterruptStateProvider.
parents e379e53e ed0ecfcb

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/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+0 −4
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import com.android.systemui.statusbar.notification.NotificationLaunchAnimatorCon 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.provider.LaunchFullScreenIntentProvider;

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

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

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

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

import com.android.systemui.statusbar.notification.row.OnUserInteractionCallback;
@@ -115,7 +114,6 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
    private final NotificationLockscreenUserManager mLockscreenUserManager;

    private final com.android.systemui.shade.ShadeController mShadeController;

    private final KeyguardStateController mKeyguardStateController;

    private final NotificationInterruptStateProvider mNotificationInterruptStateProvider;

    private final LockPatternUtils mLockPatternUtils;

    private final StatusBarRemoteInputCallback mStatusBarRemoteInputCallback;

    private final ActivityIntentHelper mActivityIntentHelper;
@@ -154,7 +152,6 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
            NotificationLockscreenUserManager lockscreenUserManager,

            ShadeController shadeController,

            KeyguardStateController keyguardStateController,

            NotificationInterruptStateProvider notificationInterruptStateProvider,

            LockPatternUtils lockPatternUtils,

            StatusBarRemoteInputCallback remoteInputCallback,

            ActivityIntentHelper activityIntentHelper,
@@ -187,7 +184,6 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
        mLockscreenUserManager = lockscreenUserManager;

        mShadeController = shadeController;

        mKeyguardStateController = keyguardStateController;

        mNotificationInterruptStateProvider = notificationInterruptStateProvider;

        mLockPatternUtils = lockPatternUtils;

        mStatusBarRemoteInputCallback = remoteInputCallback;

        mActivityIntentHelper = activityIntentHelper;