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

Commit f6ad6329 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Expand NotificationsModule 

This CL is the 1st in the series of CLs which intend to "unbind" StatusBar on TV.
In order to make StatusBar really optional and thus to allow us to unbind it, we also need to make some of the classes that depends on it optional as well. For all these cases we need to move from @Inject-annotated contructors to @Provides annotated methods. For this we are expanding NotificationsModule.

Change-Id: Icccafd2170f2fdffb8412370056aab7042ffd580
Test: make SystemUI; make CarSystemUI; atest SystemUITests
Bug: 146188087
parent 8a48bc0b

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

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.systemui.stackdivider.Divider; 
import com.android.systemui.statusbar.car.CarStatusBar;

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

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

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

import com.android.systemui.statusbar.tv.TvStatusBar;

import com.android.systemui.theme.ThemeOverlayController;
@@ -42,7 +43,7 @@ import dagger.multibindings.ClassKey; 
import dagger.multibindings.IntoMap;



/** Binder for car specific {@link SystemUI} modules. */

@Module(includes = {RecentsModule.class, CarStatusBarModule.class})

@Module(includes = {RecentsModule.class, CarStatusBarModule.class, NotificationsModule.class})

public abstract class CarSystemUIBinder {

    /** Inject into AuthController. */

    @Binds

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.recents.RecentsModule; 
import com.android.systemui.shortcut.ShortcutKeyDispatcher;

import com.android.systemui.stackdivider.Divider;

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

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

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

import com.android.systemui.statusbar.tv.TvStatusBar;
@@ -49,7 +50,7 @@ import dagger.multibindings.IntoMap; 
/**

 * SystemUI objects that are injectable should go here.

 */

@Module(includes = {RecentsModule.class, StatusBarModule.class})

@Module(includes = {RecentsModule.class, StatusBarModule.class, NotificationsModule.class})

public abstract class SystemUIBinder {

    /** Inject into AuthController. */

    @Binds

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

+0 −3
Original line number Diff line number Diff line
@@ -35,10 +35,8 @@ import com.android.systemui.statusbar.BlurUtils; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeWindowBlurController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

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

import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent;

import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent;
@@ -69,7 +67,6 @@ import dagger.Provides; 
            AssistModule.class,

            ConcurrencyModule.class,

            LogModule.class,

            NotificationsModule.class,

            PeopleHubModule.class,

        },

        subcomponents = {StatusBarComponent.class,

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java

+4 −5
Original line number Diff line number Diff line
@@ -28,13 +28,10 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

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



import javax.inject.Inject;

import javax.inject.Singleton;



/** Handles heads-up and pulsing behavior driven by notification changes. */

@Singleton

public class NotificationAlertingManager {



    private static final String TAG = "NotifAlertManager";
@@ -47,7 +44,9 @@ public class NotificationAlertingManager { 


    private HeadsUpManager mHeadsUpManager;



    @Inject

    /**

     * Injected constructor. See {@link NotificationsModule}.

     */

    public NotificationAlertingManager(

            NotificationEntryManager notificationEntryManager,

            NotificationRemoteInputManager remoteInputManager,

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+4 −5
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationRankin 
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;

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

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

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

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

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

import com.android.systemui.statusbar.phone.NotificationGroupManager;
@@ -64,9 +65,6 @@ import java.util.List; 
import java.util.Map;

import java.util.Set;



import javax.inject.Inject;

import javax.inject.Singleton;



import dagger.Lazy;



/**
@@ -94,7 +92,6 @@ import dagger.Lazy; 
 * aware of

 * @see #getActiveNotificationsForCurrentUser() to see every notification that the current user owns

 */

@Singleton

public class NotificationEntryManager implements

        CommonNotifCollection,

        Dumpable,
@@ -181,7 +178,9 @@ public class NotificationEntryManager implements 
        }

    }



    @Inject

    /**

     * Injected constructor. See {@link NotificationsModule}.

     */

    public NotificationEntryManager(

            NotificationEntryManagerLogger logger,

            NotificationGroupManager groupManager,