Pass PluginDependencyProvider into StatusBar. (2c2ba3c7) · 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
		@@ -79,6 +79,7 @@ import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.navigationbar.car.CarNavigationBarController;
		import com.android.systemui.plugins.DarkIconDispatcher;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.PluginDependencyProvider;
		import com.android.systemui.plugins.qs.QS;
		import com.android.systemui.qs.car.CarQSFragment;
		import com.android.systemui.recents.Recents;
		@@ -326,6 +327,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		InitController initController,
		DarkIconDispatcher darkIconDispatcher,
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		DismissCallbackRegistry dismissCallbackRegistry,
		/* Car Settings injected components. */
		CarServiceProvider carServiceProvider,
		@@ -409,6 +411,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		initController,
		darkIconDispatcher,
		timeTickHandler,
		pluginDependencyProvider,
		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
		@@ -41,6 +41,7 @@ import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.navigationbar.car.CarNavigationBarController;
		import com.android.systemui.plugins.DarkIconDispatcher;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.PluginDependencyProvider;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.ScreenPinningRequest;
		import com.android.systemui.shared.plugins.PluginManager;
		@@ -196,6 +197,7 @@ public class CarStatusBarModule {
		InitController initController,
		DarkIconDispatcher darkIconDispatcher,
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		DismissCallbackRegistry dismissCallbackRegistry,
		CarServiceProvider carServiceProvider,
		Lazy<PowerManagerHelper> powerManagerHelperLazy,
		@@ -277,6 +279,7 @@ public class CarStatusBarModule {
		initController,
		darkIconDispatcher,
		timeTickHandler,
		pluginDependencyProvider,
		dismissCallbackRegistry,
		carServiceProvider,
		powerManagerHelperLazy,

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -387,6 +387,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		private final LightsOutNotifController mLightsOutNotifController;
		private final InitController mInitController;
		private final DarkIconDispatcher mDarkIconDispatcher;
		private final PluginDependencyProvider mPluginDependencyProvider;
		private final DismissCallbackRegistry mDismissCallbackRegistry;

		// expanded notifications
		@@ -687,6 +688,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		InitController initController,
		DarkIconDispatcher darkIconDispatcher,
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		DismissCallbackRegistry dismissCallbackRegistry) {
		super(context);
		mFeatureFlags = featureFlags;
		@@ -762,6 +764,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		mKeyguardViewMediatorCallback = viewMediatorCallback;
		mInitController = initController;
		mDarkIconDispatcher = darkIconDispatcher;
		mPluginDependencyProvider = pluginDependencyProvider;
		mDismissCallbackRegistry = dismissCallbackRegistry;

		mBubbleExpandListener =
		@@ -995,10 +998,8 @@ public class StatusBar extends SystemUI implements DemoMode,

		mDarkIconDispatcher.addDarkReceiver(mNotificationIconAreaController);
		// Allow plugins to reference DarkIconDispatcher and StatusBarStateController
		Dependency.get(PluginDependencyProvider.class)
		.allowPluginDependency(DarkIconDispatcher.class);
		Dependency.get(PluginDependencyProvider.class)
		.allowPluginDependency(StatusBarStateController.class);
		mPluginDependencyProvider.allowPluginDependency(DarkIconDispatcher.class);
		mPluginDependencyProvider.allowPluginDependency(StatusBarStateController.class);
		FragmentHostManager.get(mStatusBarWindow)
		.addTagListener(CollapsedStatusBarFragment.TAG, (tag, fragment) -> {
		CollapsedStatusBarFragment statusBarFragment =

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.plugins.DarkIconDispatcher;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.PluginDependencyProvider;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.ScreenPinningRequest;
		import com.android.systemui.shared.plugins.PluginManager;
		@@ -176,6 +177,7 @@ public class StatusBarModule {
		InitController initController,
		DarkIconDispatcher darkIconDispatcher,
		@Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,
		PluginDependencyProvider pluginDependencyProvider,
		DismissCallbackRegistry dismissCallbackRegistry) {
		return new StatusBar(
		context,
		@@ -253,6 +255,7 @@ public class StatusBarModule {
		initController,
		darkIconDispatcher,
		timeTickHandler,
		pluginDependencyProvider,
		dismissCallbackRegistry);
		}
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.plugins.ActivityStarter.OnDismissAction;
		import com.android.systemui.plugins.DarkIconDispatcher;
		import com.android.systemui.plugins.PluginDependencyProvider;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.ScreenPinningRequest;
		@@ -246,6 +247,7 @@ public class StatusBarTest extends SysuiTestCase {
		@Mock private StatusBarNotificationActivityStarter.Builder
		mStatusBarNotificationActivityStarterBuilder;
		@Mock private DarkIconDispatcher mDarkIconDispatcher;
		@Mock private PluginDependencyProvider mPluginDependencyProvider;
		private ShadeController mShadeController;
		private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());
		private InitController mInitController = new InitController();
		@@ -400,6 +402,7 @@ public class StatusBarTest extends SysuiTestCase {
		mInitController,
		mDarkIconDispatcher,
		new Handler(TestableLooper.get(this).getLooper()),
		mPluginDependencyProvider,
		mDismissCallbackRegistry);

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