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

Commit a30b88ba authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove last call to getComponent(VolumeComponent.class) 

Bug: 143982852
Test: atest SystemUITests
Change-Id: I4f23bda8148a8b484035c19f7745a3e2a40ba436
parent 23979fa2

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

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ import com.android.systemui.statusbar.policy.NetworkController; 
import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

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

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

import com.android.systemui.volume.VolumeComponent;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -292,6 +293,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            VolumeComponent volumeComponent,

            CommandQueue commandQueue,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,
@@ -359,6 +361,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                dozeServiceHost,

                powerManager,

                dozeScrimController,

                volumeComponent,

                commandQueue,

                pluginManager,

                remoteInputUriController,

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

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.systemui.statusbar.policy.NetworkController; 
import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

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

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

import com.android.systemui.volume.VolumeComponent;



import java.util.Optional;
@@ -161,6 +162,7 @@ public class CarStatusBarModule { 
            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            VolumeComponent volumeComponent,

            CommandQueue commandQueue,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,
@@ -226,6 +228,7 @@ public class CarStatusBarModule { 
                dozeServiceHost,

                powerManager,

                dozeScrimController,

                volumeComponent,

                commandQueue,

                pluginManager,

                remoteInputUriController,

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

+8 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ import com.android.systemui.statusbar.policy.ZenModeController; 
import com.android.systemui.statusbar.policy.ZenModeControllerImpl;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerServiceImpl;

import com.android.systemui.volume.VolumeComponent;

import com.android.systemui.volume.VolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogControllerImpl;



import dagger.Binds;
@@ -249,4 +251,10 @@ public abstract class DependencyBinder { 
     */

    @Binds

    public abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost);



    /**

     */

    @Binds

    public abstract VolumeComponent provideVolumeComponent(

            VolumeDialogComponent volumeDialogComponent);

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+3 −4
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private PhoneStatusBarPolicy mIconPolicy;

    private StatusBarSignalPolicy mSignalPolicy;



    private VolumeComponent mVolumeComponent;

    private final VolumeComponent mVolumeComponent;

    private BrightnessMirrorController mBrightnessMirrorController;

    private boolean mBrightnessMirrorVisible;

    private BiometricUnlockController mBiometricUnlockController;
@@ -669,6 +669,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            VolumeComponent volumeComponent,

            CommandQueue commandQueue,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,
@@ -733,6 +734,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mLockscreenWallpaperLazy = lockscreenWallpaperLazy;

        mDozeScrimController = dozeScrimController;

        mBiometricUnlockControllerLazy = biometricUnlockControllerLazy;

        mVolumeComponent = volumeComponent;

        mCommandQueue = commandQueue;

        mPluginManager = pluginManager;

        mRemoteInputUriController = remoteInputUriController;
@@ -1097,9 +1099,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mMediaManager.setup(backdrop, backdrop.findViewById(R.id.backdrop_front),

                backdrop.findViewById(R.id.backdrop_back), mScrimController, mLockscreenWallpaper);



        // Other icons

        mVolumeComponent = getComponent(VolumeComponent.class);



        mNotificationPanel.setUserSetupComplete(mUserSetup);

        if (UserManager.get(mContext).isUserSwitcherEnabled()) {

            createUserSwitcher();

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.systemui.statusbar.policy.NetworkController; 
import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;

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

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

import com.android.systemui.volume.VolumeComponent;



import java.util.Optional;
@@ -147,6 +148,7 @@ public class StatusBarModule { 
            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            VolumeComponent volumeComponent,

            CommandQueue commandQueue,

            PluginManager pluginManager,

            RemoteInputUriController remoteInputUriController,
@@ -212,6 +214,7 @@ public class StatusBarModule { 
                dozeServiceHost,

                powerManager,

                dozeScrimController,

                volumeComponent,

                commandQueue,

                pluginManager,

                remoteInputUriController,