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

Commit 4dd47fa5 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove all calls to getComponent(StatusBar.class) 

Bug: 143224715
Test: atest SystemUITests && manual
Change-Id: I349836eed9c1e988205681b93f86e967156f90a9
parent 5fdaa0c9

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

+2 −5
Original line number Diff line number Diff line
@@ -101,11 +101,8 @@ abstract class CarSystemUIModule { 
    abstract NotificationData.KeyguardEnvironment bindKeyguardEnvironment(

            KeyguardEnvironmentImpl keyguardEnvironment);



    @Singleton

    @Provides

    static ShadeController provideShadeController(Context context) {

        return SysUiServiceProvider.getComponent(context, StatusBar.class);

    }

    @Binds

    abstract ShadeController provideShadeController(CarStatusBar statusBar);



    @Provides

    @Singleton

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

+5 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ import com.android.systemui.navigationbar.car.CarNavigationBarView; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.qs.QS;

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

import com.android.systemui.recents.ScreenPinningRequest;

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

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;
@@ -283,7 +284,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            VisualStabilityManager visualStabilityManager,

            DeviceProvisionedController deviceProvisionedController,

            NavigationBarController navigationBarController,

            AssistManager assistManager,

            Lazy<AssistManager> assistManagerLazy,

            NotificationListener notificationListener,

            ConfigurationController configurationController,

            StatusBarWindowController statusBarWindowController,
@@ -294,6 +295,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            ScreenPinningRequest screenPinningRequest,

            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager,
@@ -352,7 +354,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                visualStabilityManager,

                deviceProvisionedController,

                navigationBarController,

                assistManager,

                assistManagerLazy,

                notificationListener,

                configurationController,

                statusBarWindowController,
@@ -364,6 +366,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                biometricUnlockControllerLazy,

                dozeServiceHost,

                powerManager,

                screenPinningRequest,

                dozeScrimController,

                commandQueue,

                pluginManager,

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

+5 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.keyguard.ScreenLifecycle; 
import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.navigationbar.car.CarNavigationBarController;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.recents.ScreenPinningRequest;

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

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;
@@ -152,7 +153,7 @@ public class CarStatusBarModule { 
            VisualStabilityManager visualStabilityManager,

            DeviceProvisionedController deviceProvisionedController,

            NavigationBarController navigationBarController,

            AssistManager assistManager,

            Lazy<AssistManager> assistManagerLazy,

            NotificationListener notificationListener,

            ConfigurationController configurationController,

            StatusBarWindowController statusBarWindowController,
@@ -163,6 +164,7 @@ public class CarStatusBarModule { 
            Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            ScreenPinningRequest screenPinningRequest,

            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager,
@@ -220,7 +222,7 @@ public class CarStatusBarModule { 
                visualStabilityManager,

                deviceProvisionedController,

                navigationBarController,

                assistManager,

                assistManagerLazy,

                notificationListener,

                configurationController,

                statusBarWindowController,
@@ -231,6 +233,7 @@ public class CarStatusBarModule { 
                biometricUnlockControllerLazy,

                dozeServiceHost,

                powerManager,

                screenPinningRequest,

                dozeScrimController,

                commandQueue,

                pluginManager,

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

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ import com.android.systemui.statusbar.phone.NavigationModeController; 
import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper;

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

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

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

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

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

import com.android.systemui.statusbar.policy.AccessibilityController;
@@ -328,6 +329,7 @@ public class Dependency { 
    @Inject Lazy<DozeParameters> mDozeParameters;

    @Inject Lazy<IWallpaperManager> mWallpaperManager;

    @Inject Lazy<CommandQueue> mCommandQueue;

    @Inject Lazy<StatusBar> mStatusBar;



    @Inject

    public Dependency() {
@@ -517,6 +519,7 @@ public class Dependency { 
        mProviders.put(DozeParameters.class, mDozeParameters::get);

        mProviders.put(IWallpaperManager.class, mWallpaperManager::get);

        mProviders.put(CommandQueue.class, mCommandQueue::get);

        mProviders.put(StatusBar.class, mStatusBar::get);



        // TODO(b/118592525): to support multi-display , we start to add something which is

        //                    per-display, while others may be global. I think it's time to add

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+4 −6
Original line number Diff line number Diff line
@@ -42,10 +42,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.settingslib.applications.InterestingConfigChanges;

import com.android.systemui.ConfigurationChangedReceiver;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.assist.ui.DefaultUiController;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -163,14 +161,15 @@ public class AssistManager implements ConfigurationChangedReceiver { 
            AssistUtils assistUtils,

            AssistHandleBehaviorController handleController,

            CommandQueue commandQueue,

            BroadcastDispatcher broadcastDispatcher) {

            PhoneStateMonitor phoneStateMonitor,

            OverviewProxyService overviewProxyService) {

        mContext = context;

        mDeviceProvisionedController = controller;

        mCommandQueue = commandQueue;

        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mAssistUtils = assistUtils;

        mAssistDisclosure = new AssistDisclosure(context, new Handler());

        mPhoneStateMonitor = new PhoneStateMonitor(context, broadcastDispatcher);

        mPhoneStateMonitor = phoneStateMonitor;

        mHandleController = handleController;



        registerVoiceInteractionSessionListener();
@@ -182,8 +181,7 @@ public class AssistManager implements ConfigurationChangedReceiver { 


        mUiController = new DefaultUiController(mContext);



        OverviewProxyService overviewProxy = Dependency.get(OverviewProxyService.class);

        overviewProxy.addCallback(new OverviewProxyService.OverviewProxyListener() {

        overviewProxyService.addCallback(new OverviewProxyService.OverviewProxyListener() {

            @Override

            public void onAssistantProgress(float progress) {

                // Progress goes from 0 to 1 to indicate how close the assist gesture is to