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

Commit 46f1013e authored by Kevin Han's avatar Kevin Han
Browse files

Combine AlertingManager and HeadsUpBindController 

Previously, it was difficult to tell when a notification was inflated
before trying to show the heads up, and we got around it with a (now
flawed) heuristic based off if a notification was just inflated and
it has a heads up view.

This issue stems from having two control classes that are not really
communicating with each other. By combining these classes into one
heads up controller, the logic becomes more readable and we can directly
put a callback to show the HUN when the HUN content is inflated.

Bug: 149028421
Test: HUN smoke test
Change-Id: Ibb75597cfe26ccaf7e4d5247dc69d69bdf421ee6
parent 42aa54c1

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

+0 −3
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 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;
@@ -170,7 +169,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            NotificationInterruptStateProvider notificationInterruptStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            NotificationAlertingManager notificationAlertingManager,

            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            @UiBackground Executor uiBgExecutor,
@@ -251,7 +249,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                notificationInterruptStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

                notificationAlertingManager,

                displayMetrics,

                metricsLogger,

                uiBgExecutor,

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

+0 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 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;
@@ -145,7 +144,6 @@ public class CarStatusBarModule { 
            NotificationInterruptStateProvider notificationInterruptionStateProvider,

            NotificationViewHierarchyManager notificationViewHierarchyManager,

            KeyguardViewMediator keyguardViewMediator,

            NotificationAlertingManager notificationAlertingManager,

            DisplayMetrics displayMetrics,

            MetricsLogger metricsLogger,

            @UiBackground Executor uiBgExecutor,
@@ -225,7 +223,6 @@ public class CarStatusBarModule { 
                notificationInterruptionStateProvider,

                notificationViewHierarchyManager,

                keyguardViewMediator,

                notificationAlertingManager,

                displayMetrics,

                metricsLogger,

                uiBgExecutor,

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

+0 −4
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 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.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;
@@ -293,8 +292,6 @@ public class Dependency { 
    @Inject Lazy<RemoteInputQuickSettingsDisabler> mRemoteInputQuickSettingsDisabler;

    @Inject Lazy<BubbleController> mBubbleController;

    @Inject Lazy<NotificationEntryManager> mNotificationEntryManager;

    @Inject

    Lazy<NotificationAlertingManager> mNotificationAlertingManager;

    @Inject Lazy<SensorPrivacyManager> mSensorPrivacyManager;

    @Inject Lazy<AutoHideController> mAutoHideController;

    @Inject Lazy<ForegroundServiceNotificationListener> mForegroundServiceNotificationListener;
@@ -493,7 +490,6 @@ public class Dependency { 
                mRemoteInputQuickSettingsDisabler::get);

        mProviders.put(BubbleController.class, mBubbleController::get);

        mProviders.put(NotificationEntryManager.class, mNotificationEntryManager::get);

        mProviders.put(NotificationAlertingManager.class, mNotificationAlertingManager::get);

        mProviders.put(ForegroundServiceNotificationListener.class,

                mForegroundServiceNotificationListener::get);

        mProviders.put(ClockManager.class, mClockManager::get);

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.systemui.statusbar.notification.collection.coordinator;



import static com.android.systemui.statusbar.NotificationRemoteInputManager.FORCE_REMOTE_INPUT_HISTORY;

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

import static com.android.systemui.statusbar.notification.interruption.HeadsUpController.alertAgain;



import android.annotation.Nullable;
@@ -29,7 +29,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.plugga 
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSection;

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

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

import com.android.systemui.statusbar.notification.headsup.HeadsUpViewBinder;

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

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

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

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

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

+0 −23
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.systemui.statusbar.notification.collection.provider.HighPrior 
import com.android.systemui.statusbar.notification.init.NotificationsController;

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

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

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

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

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

import com.android.systemui.statusbar.notification.logging.NotificationLogger;
@@ -55,7 +54,6 @@ import com.android.systemui.statusbar.notification.row.NotificationBlockingHelpe 
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

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

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

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

import com.android.systemui.util.leak.LeakDetector;



import java.util.concurrent.Executor;
@@ -130,27 +128,6 @@ public interface NotificationsModule { 
        return new VisualStabilityManager(notificationEntryManager, handler);

    }



    /** Provides an instance of {@link NotificationAlertingManager} */

    @Singleton

    @Provides

    static NotificationAlertingManager provideNotificationAlertingManager(

            NotificationEntryManager notificationEntryManager,

            NotificationRemoteInputManager remoteInputManager,

            VisualStabilityManager visualStabilityManager,

            StatusBarStateController statusBarStateController,

            NotificationInterruptStateProvider notificationInterruptStateProvider,

            NotificationListener notificationListener,

            HeadsUpManager headsUpManager) {

        return new NotificationAlertingManager(

                notificationEntryManager,

                remoteInputManager,

                visualStabilityManager,

                statusBarStateController,

                notificationInterruptStateProvider,

                notificationListener,

                headsUpManager);

    }



    /** Provides an instance of {@link NotificationLogger} */

    @Singleton

    @Provides