Pass ExtensionController into StatusBar. (facd72f1) · 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
		@@ -136,6 +136,7 @@ import com.android.systemui.statusbar.phone.StatusBarWindowController;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.ExtensionController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		@@ -330,6 +331,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		KeyguardDismissUtil keyguardDismissUtil,
		ExtensionController extensionController,
		DismissCallbackRegistry dismissCallbackRegistry,
		/* Car Settings injected components. */
		CarServiceProvider carServiceProvider,
		@@ -415,6 +417,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		timeTickHandler,
		pluginDependencyProvider,
		keyguardDismissUtil,
		extensionController,
		dismissCallbackRegistry);
		mScrimController = scrimController;
		mLockscreenLockIconController = lockscreenLockIconController;

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ import com.android.systemui.statusbar.phone.StatusBarWindowController;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.ExtensionController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		@@ -200,6 +201,7 @@ public class CarStatusBarModule {
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		KeyguardDismissUtil keyguardDismissUtil,
		ExtensionController extensionController,
		DismissCallbackRegistry dismissCallbackRegistry,
		CarServiceProvider carServiceProvider,
		Lazy<PowerManagerHelper> powerManagerHelperLazy,
		@@ -283,6 +285,7 @@ public class CarStatusBarModule {
		timeTickHandler,
		pluginDependencyProvider,
		keyguardDismissUtil,
		extensionController,
		dismissCallbackRegistry,
		carServiceProvider,
		powerManagerHelperLazy,

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -389,6 +389,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		private final DarkIconDispatcher mDarkIconDispatcher;
		private final PluginDependencyProvider mPluginDependencyProvider;
		private final KeyguardDismissUtil mKeyguardDismissUtil;
		private final ExtensionController mExtensionController;
		private final DismissCallbackRegistry mDismissCallbackRegistry;

		// expanded notifications
		@@ -691,6 +692,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		KeyguardDismissUtil keyguardDismissUtil,
		ExtensionController extensionController,
		DismissCallbackRegistry dismissCallbackRegistry) {
		super(context);
		mFeatureFlags = featureFlags;
		@@ -768,6 +770,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		mDarkIconDispatcher = darkIconDispatcher;
		mPluginDependencyProvider = pluginDependencyProvider;
		mKeyguardDismissUtil = keyguardDismissUtil;
		mExtensionController = extensionController;
		mDismissCallbackRegistry = dismissCallbackRegistry;

		mBubbleExpandListener =
		@@ -1129,7 +1132,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		if (container != null) {
		FragmentHostManager fragmentHostManager = FragmentHostManager.get(container);
		ExtensionFragmentListener.attachExtensonToFragment(container, QS.TAG, R.id.qs_frame,
		Dependency.get(ExtensionController.class)
		mExtensionController
		.newExtension(QS.class)
		.withPlugin(QS.class)
		.withDefault(this::createDefaultQSFragment)

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.ExtensionController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		@@ -179,6 +180,7 @@ public class StatusBarModule {
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		KeyguardDismissUtil keyguardDismissUtil,
		ExtensionController extensionController,
		DismissCallbackRegistry dismissCallbackRegistry) {
		return new StatusBar(
		context,
		@@ -258,6 +260,7 @@ public class StatusBarModule {
		timeTickHandler,
		pluginDependencyProvider,
		keyguardDismissUtil,
		extensionController,
		dismissCallbackRegistry);
		}
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.ExtensionController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		@@ -249,6 +250,7 @@ public class StatusBarTest extends SysuiTestCase {
		@Mock private DarkIconDispatcher mDarkIconDispatcher;
		@Mock private PluginDependencyProvider mPluginDependencyProvider;
		@Mock private KeyguardDismissUtil mKeyguardDismissUtil;
		@Mock private ExtensionController mExtensionController;
		private ShadeController mShadeController;
		private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());
		private InitController mInitController = new InitController();
		@@ -404,6 +406,7 @@ public class StatusBarTest extends SysuiTestCase {
		new Handler(TestableLooper.get(this).getLooper()),
		mPluginDependencyProvider,
		mKeyguardDismissUtil,
		mExtensionController,
		mDismissCallbackRegistry);

		when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn(