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

Commit 613c7c6c authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove Divider from Components. 

This removes all calls to getComponent(Divider.class) and
replaced them with dependency injection.

Bug: 143777499
Test: atest SystemUITests
Change-Id: Ib3704a282593b694fe08bd7228e87f75d18920ed
parent 6f382b70

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

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.dock.DockManager; 
import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.car.CarStatusBar;
@@ -68,6 +69,12 @@ abstract class CarSystemUIModule { 
    abstract NotificationEntryManager bindNotificationEntryManager(

            CarNotificationEntryManager notificationEntryManager);



    @Singleton

    @Provides

    static Divider provideDivider(Context context) {

        return new Divider(context);

    }



    @Singleton

    @Provides

    @Named(LEAK_REPORT_EMAIL_NAME)

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

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.qs.QS;

import com.android.systemui.qs.car.CarQSFragment;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.FlingAnimationUtils;
@@ -136,6 +137,7 @@ import com.android.systemui.statusbar.policy.ZenModeController; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Map;

import java.util.Optional;



import javax.inject.Named;
@@ -302,6 +304,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            CommandQueue commandQueue,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,

            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            /* Car Settings injected components. */

            CarNavigationBarController carNavigationBarController) {
@@ -372,6 +375,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                commandQueue,

                pluginManager,

                remoteInputUriController,

                dividerOptional,

                superStatusBarViewFactory);

        mScrimController = scrimController;

        mCarNavigationBarController = carNavigationBarController;

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

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.keyguard.WakefulnessLifecycle; 
import com.android.systemui.navigationbar.car.CarNavigationBarController;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NavigationBarController;
@@ -87,6 +88,8 @@ import com.android.systemui.statusbar.policy.RemoteInputUriController; 
import com.android.systemui.statusbar.policy.UserSwitcherController;

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



import java.util.Optional;



import javax.inject.Named;

import javax.inject.Singleton;
@@ -170,6 +173,7 @@ public class CarStatusBarModule { 
            CommandQueue commandQueue,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,

            Optional<Divider> dividerOptional,

            SuperStatusBarViewFactory superStatusBarViewFactory,

            CarNavigationBarController carNavigationBarController) {

        return new CarStatusBar(
@@ -238,6 +242,7 @@ public class CarStatusBarModule { 
                commandQueue,

                pluginManager,

                remoteInputUriController,

                dividerOptional,

                superStatusBarViewFactory,

                carNavigationBarController);

    }

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

+15 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import com.android.systemui.pip.PipUI; 
import com.android.systemui.power.PowerUI;

import com.android.systemui.recents.Recents;

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.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarModule;
@@ -52,11 +54,17 @@ public abstract class SystemUIBinder { 
    @ClassKey(AuthController.class)

    public abstract SystemUI bindAuthController(AuthController service);



    /** Inject into Divider. */

    @Binds

    @IntoMap

    @ClassKey(Divider.class)

    public abstract SystemUI bindDivider(Divider sysui);



    /** Inject into GarbageMonitor.Service. */

    @Binds

    @IntoMap

    @ClassKey(GarbageMonitor.Service.class)

    public abstract SystemUI bindGarbageMonitorService(GarbageMonitor.Service service);

    public abstract SystemUI bindGarbageMonitorService(GarbageMonitor.Service sysui);



    /** Inject into GlobalActionsComponent. */

    @Binds
@@ -106,6 +114,12 @@ public abstract class SystemUIBinder { 
    @ClassKey(ScreenDecorations.class)

    public abstract SystemUI bindScreenDecorations(ScreenDecorations sysui);



    /** Inject into ShortcutKeyDispatcher. */

    @Binds

    @IntoMap

    @ClassKey(ShortcutKeyDispatcher.class)

    public abstract SystemUI bindsShortcutKeyDispatcher(ShortcutKeyDispatcher sysui);



    /** Inject into SizeCompatModeActivityController. */

    @Binds

    @IntoMap

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

+9 −0
Original line number Diff line number Diff line
@@ -19,12 +19,15 @@ package com.android.systemui.dagger; 
import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME;



import android.content.Context;



import androidx.annotation.Nullable;



import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.notification.collection.NotificationData;
@@ -77,4 +80,10 @@ abstract class SystemUIDefaultModule { 
    static boolean provideAllowNotificationLongPress() {

        return true;

    }



    @Singleton

    @Provides

    static Divider provideDivider(Context context) {

        return new Divider(context);

    }

}