Merge "Remove last call to getComponent(VolumeComponent.class)" (3a4b8675) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,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;
		@@ -297,6 +298,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		PowerManager powerManager,
		ScreenPinningRequest screenPinningRequest,
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		PluginManager pluginManager,
		RemoteInputUriController remoteInputUriController,
		@@ -368,6 +370,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		powerManager,
		screenPinningRequest,
		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
		@@ -87,6 +87,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;

		@@ -166,6 +167,7 @@ public class CarStatusBarModule {
		PowerManager powerManager,
		ScreenPinningRequest screenPinningRequest,
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		PluginManager pluginManager,
		RemoteInputUriController remoteInputUriController,
		@@ -235,6 +237,7 @@ public class CarStatusBarModule {
		powerManager,
		screenPinningRequest,
		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
		@@ -342,7 +342,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;
		@@ -672,6 +672,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		PowerManager powerManager,
		ScreenPinningRequest screenPinningRequest,
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		PluginManager pluginManager,
		RemoteInputUriController remoteInputUriController,
		@@ -740,6 +741,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		mScreenPinningRequest = screenPinningRequest;
		mDozeScrimController = dozeScrimController;
		mBiometricUnlockControllerLazy = biometricUnlockControllerLazy;
		mVolumeComponent = volumeComponent;
		mCommandQueue = commandQueue;
		mPluginManager = pluginManager;
		mRemoteInputUriController = remoteInputUriController;
		@@ -1106,9 +1108,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
		@@ -71,6 +71,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;

		@@ -151,6 +152,7 @@ public class StatusBarModule {
		PowerManager powerManager,
		ScreenPinningRequest screenPinningRequest,
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		PluginManager pluginManager,
		RemoteInputUriController remoteInputUriController,
		@@ -220,6 +222,7 @@ public class StatusBarModule {
		powerManager,
		screenPinningRequest,
		dozeScrimController,
		volumeComponent,
		commandQueue,
		pluginManager,
		remoteInputUriController,