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

Commit aea2128f authored by Beverly Tai's avatar Beverly Tai
Browse files

Create interface for NotifInterruptStateProvider 

This CL was removed by automerger, so readding contents now.

Test: atest SystemUITests
Bug: 151320608
Bug: 151334714
Change-Id: Icbdca66f8d6408f3370348d9e4b55555e56076de
parent c301b482

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+0 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.Context; 
import com.android.keyguard.KeyguardViewController;

import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.car.CarDeviceProvisionedControllerImpl;

import com.android.systemui.car.CarNotificationInterruptionStateProvider;

import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;
@@ -41,7 +40,6 @@ import com.android.systemui.statusbar.car.CarShadeControllerImpl; 
import com.android.systemui.statusbar.car.CarStatusBar;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

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

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

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
@@ -67,10 +65,6 @@ import dagger.Provides; 
@Module(includes = {DividerModule.class})

abstract class CarSystemUIModule {



    @Binds

    abstract NotificationInterruptionStateProvider bindNotificationInterruptionStateProvider(

            CarNotificationInterruptionStateProvider notificationInterruptionStateProvider);



    @Singleton

    @Provides

    @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME)

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+23 −5
Original line number Diff line number Diff line
@@ -95,13 +95,15 @@ import com.android.systemui.statusbar.PulseExpansionHandler; 
import com.android.systemui.statusbar.SuperStatusBarViewFactory;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.AutoHideController;
@@ -249,7 +251,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationInterruptStateProvider notificationInterruptStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            NotificationAlertingManager notificationAlertingManager,
@@ -335,7 +337,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                remoteInputQuickSettingsDisabler,

                notificationGutsManager,

                notificationLogger,

                notificationInterruptionStateProvider,

                notificationInterruptStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

                notificationAlertingManager,
@@ -488,6 +490,22 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                                .isCurrentUserSetupInProgress();

                    }

                });



        mNotificationInterruptStateProvider.addSuppressor(new NotificationInterruptSuppressor() {

            @Override

            public String getName() {

                return TAG;

            }



            @Override

            public boolean suppressInterruptions(NotificationEntry entry) {

                // Because space is usually constrained in the auto use-case, there should not be a

                // pinned notification when the shade has been expanded.

                // Ensure this by not allowing any interruptions (ie: pinning any notifications) if

                // the shade is already opened.

                return !getPresenter().isPresenterFullyCollapsed();

            }

        });

    }



    @Override

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+4 −4
Original line number Diff line number Diff line
@@ -62,13 +62,13 @@ import com.android.systemui.statusbar.SuperStatusBarViewFactory; 
import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.dagger.StatusBarDependenciesModule;

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.notification.row.NotificationRowModule;
@@ -146,7 +146,7 @@ public class CarStatusBarModule { 
            RemoteInputQuickSettingsDisabler remoteInputQuickSettingsDisabler,

            NotificationGutsManager notificationGutsManager,

            NotificationLogger notificationLogger,

            NotificationInterruptionStateProvider notificationInterruptionStateProvider,

            NotificationInterruptStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            NotificationAlertingManager notificationAlertingManager,

packages/SystemUI/src/com/android/systemui/Dependency.java

+1 −5
Original line number Diff line number Diff line
@@ -71,12 +71,11 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; 
import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.VibratorHelper;

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

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

import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;

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

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

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

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

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

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

import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
@@ -289,7 +288,6 @@ public class Dependency { 
    @Inject Lazy<NotificationLogger> mNotificationLogger;

    @Inject Lazy<NotificationViewHierarchyManager> mNotificationViewHierarchyManager;

    @Inject Lazy<NotificationFilter> mNotificationFilter;

    @Inject Lazy<NotificationInterruptionStateProvider> mNotificationInterruptionStateProvider;

    @Inject Lazy<KeyguardDismissUtil> mKeyguardDismissUtil;

    @Inject Lazy<SmartReplyController> mSmartReplyController;

    @Inject Lazy<RemoteInputQuickSettingsDisabler> mRemoteInputQuickSettingsDisabler;
@@ -489,8 +487,6 @@ public class Dependency { 
        mProviders.put(NotificationViewHierarchyManager.class,

                mNotificationViewHierarchyManager::get);

        mProviders.put(NotificationFilter.class, mNotificationFilter::get);

        mProviders.put(NotificationInterruptionStateProvider.class,

                mNotificationInterruptionStateProvider::get);

        mProviders.put(KeyguardDismissUtil.class, mKeyguardDismissUtil::get);

        mProviders.put(SmartReplyController.class, mSmartReplyController::get);

        mProviders.put(RemoteInputQuickSettingsDisabler.class,

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+8 −8
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationRemoveInterceptor;

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.phone.NotificationGroupManager;

import com.android.systemui.statusbar.phone.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.ShadeController;
@@ -169,7 +169,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
    // Callback that updates BubbleOverflowActivity on data change.

    @Nullable private Runnable mOverflowCallback = null;



    private final NotificationInterruptionStateProvider mNotificationInterruptionStateProvider;

    private final NotificationInterruptStateProvider mNotificationInterruptStateProvider;

    private IStatusBarService mBarService;



    // Used for determining view rect for touch interaction
@@ -279,7 +279,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
            ShadeController shadeController,

            BubbleData data,

            ConfigurationController configurationController,

            NotificationInterruptionStateProvider interruptionStateProvider,

            NotificationInterruptStateProvider interruptionStateProvider,

            ZenModeController zenModeController,

            NotificationLockscreenUserManager notifUserManager,

            NotificationGroupManager groupManager,
@@ -304,7 +304,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
            BubbleData data,

            @Nullable BubbleStackView.SurfaceSynchronizer synchronizer,

            ConfigurationController configurationController,

            NotificationInterruptionStateProvider interruptionStateProvider,

            NotificationInterruptStateProvider interruptionStateProvider,

            ZenModeController zenModeController,

            NotificationLockscreenUserManager notifUserManager,

            NotificationGroupManager groupManager,
@@ -316,7 +316,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        dumpManager.registerDumpable(TAG, this);

        mContext = context;

        mShadeController = shadeController;

        mNotificationInterruptionStateProvider = interruptionStateProvider;

        mNotificationInterruptStateProvider = interruptionStateProvider;

        mNotifUserManager = notifUserManager;

        mZenModeController = zenModeController;

        mFloatingContentCoordinator = floatingContentCoordinator;
@@ -632,7 +632,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        for (NotificationEntry e :

                mNotificationEntryManager.getActiveNotificationsForCurrentUser()) {

            if (savedBubbleKeys.contains(e.getKey())

                    && mNotificationInterruptionStateProvider.shouldBubbleUp(e)

                    && mNotificationInterruptStateProvider.shouldBubbleUp(e)

                    && canLaunchInActivityView(mContext, e)) {

                updateBubble(e, /* suppressFlyout= */ true);

            }
@@ -894,7 +894,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        boolean wasAdjusted = BubbleExperimentConfig.adjustForExperiments(

                mContext, entry, previouslyUserCreated, userBlocked);



        if (mNotificationInterruptionStateProvider.shouldBubbleUp(entry)

        if (mNotificationInterruptStateProvider.shouldBubbleUp(entry)

                && (canLaunchInActivityView(mContext, entry) || wasAdjusted)) {

            if (wasAdjusted && !previouslyUserCreated) {

                // Gotta treat the auto-bubbled / whitelisted packaged bubbles as usercreated
@@ -910,7 +910,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        boolean wasAdjusted = BubbleExperimentConfig.adjustForExperiments(

                mContext, entry, previouslyUserCreated, userBlocked);



        boolean shouldBubble = mNotificationInterruptionStateProvider.shouldBubbleUp(entry)

        boolean shouldBubble = mNotificationInterruptStateProvider.shouldBubbleUp(entry)

                && (canLaunchInActivityView(mContext, entry) || wasAdjusted);

        if (!shouldBubble && mBubbleData.hasBubbleWithKey(entry.getKey())) {

            // It was previously a bubble but no longer a bubble -- lets remove it