From 2c2ba3c7d12ef92cf1f0674b5c50e7e9693a556b Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Thu, 26 Dec 2019 15:06:15 -0500 Subject: Pass PluginDependencyProvider into StatusBar. Bug: 141882822 Test: atest SystemUITests Change-Id: Iec8cc841495785b45c7b76eac0b1aacc520d999c --- .../src/com/android/systemui/statusbar/car/CarStatusBar.java | 3 +++ .../com/android/systemui/statusbar/car/CarStatusBarModule.java | 3 +++ .../src/com/android/systemui/statusbar/phone/StatusBar.java | 9 +++++---- .../com/android/systemui/statusbar/phone/StatusBarModule.java | 3 +++ .../src/com/android/systemui/statusbar/phone/StatusBarTest.java | 3 +++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 5195f1a22b67..b14ec51961a9 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -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; diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java index b4323cc86424..1b1219ea9d81 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java @@ -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 powerManagerHelperLazy, @@ -277,6 +279,7 @@ public class CarStatusBarModule { initController, darkIconDispatcher, timeTickHandler, + pluginDependencyProvider, dismissCallbackRegistry, carServiceProvider, powerManagerHelperLazy, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index e96e2583065e..448b9067a092 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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 = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java index 84a763e0b66e..865936bc3505 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java @@ -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); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 61dd2aa431b3..7040656df9ad 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -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( -- cgit v1.2.3-59-g8ed1b From 003718b44338a2496905940090d0cda4712e104c Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Thu, 26 Dec 2019 15:21:17 -0500 Subject: Pass KeyguardDismissUtil into StatusBar. Bug: 141882822 Test: atest SystemUITests Change-Id: Icd9fb0254dfb392fc7803064c5ec09add4dc07d7 --- .../src/com/android/systemui/statusbar/car/CarStatusBar.java | 3 +++ .../src/com/android/systemui/statusbar/car/CarStatusBarModule.java | 3 +++ .../SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 5 ++++- .../src/com/android/systemui/statusbar/phone/StatusBarModule.java | 2 ++ .../src/com/android/systemui/statusbar/phone/StatusBarTest.java | 3 ++- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index b14ec51961a9..944a52073dde 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -118,6 +118,7 @@ import com.android.systemui.statusbar.phone.DozeScrimController; import com.android.systemui.statusbar.phone.DozeServiceHost; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.KeyguardBypassController; +import com.android.systemui.statusbar.phone.KeyguardDismissUtil; import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LightsOutNotifController; import com.android.systemui.statusbar.phone.LockscreenLockIconController; @@ -328,6 +329,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt DarkIconDispatcher darkIconDispatcher, @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, PluginDependencyProvider pluginDependencyProvider, + KeyguardDismissUtil keyguardDismissUtil, DismissCallbackRegistry dismissCallbackRegistry, /* Car Settings injected components. */ CarServiceProvider carServiceProvider, @@ -412,6 +414,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt darkIconDispatcher, timeTickHandler, pluginDependencyProvider, + keyguardDismissUtil, dismissCallbackRegistry); mScrimController = scrimController; mLockscreenLockIconController = lockscreenLockIconController; diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java index 1b1219ea9d81..75f9357843b9 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java @@ -77,6 +77,7 @@ import com.android.systemui.statusbar.phone.DozeScrimController; import com.android.systemui.statusbar.phone.DozeServiceHost; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.KeyguardBypassController; +import com.android.systemui.statusbar.phone.KeyguardDismissUtil; import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LightsOutNotifController; import com.android.systemui.statusbar.phone.LockscreenLockIconController; @@ -198,6 +199,7 @@ public class CarStatusBarModule { DarkIconDispatcher darkIconDispatcher, @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, PluginDependencyProvider pluginDependencyProvider, + KeyguardDismissUtil keyguardDismissUtil, DismissCallbackRegistry dismissCallbackRegistry, CarServiceProvider carServiceProvider, Lazy powerManagerHelperLazy, @@ -280,6 +282,7 @@ public class CarStatusBarModule { darkIconDispatcher, timeTickHandler, pluginDependencyProvider, + keyguardDismissUtil, dismissCallbackRegistry, carServiceProvider, powerManagerHelperLazy, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 448b9067a092..ac28d6d1e433 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -388,6 +388,7 @@ public class StatusBar extends SystemUI implements DemoMode, private final InitController mInitController; private final DarkIconDispatcher mDarkIconDispatcher; private final PluginDependencyProvider mPluginDependencyProvider; + private final KeyguardDismissUtil mKeyguardDismissUtil; private final DismissCallbackRegistry mDismissCallbackRegistry; // expanded notifications @@ -689,6 +690,7 @@ public class StatusBar extends SystemUI implements DemoMode, DarkIconDispatcher darkIconDispatcher, @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, PluginDependencyProvider pluginDependencyProvider, + KeyguardDismissUtil keyguardDismissUtil, DismissCallbackRegistry dismissCallbackRegistry) { super(context); mFeatureFlags = featureFlags; @@ -765,6 +767,7 @@ public class StatusBar extends SystemUI implements DemoMode, mInitController = initController; mDarkIconDispatcher = darkIconDispatcher; mPluginDependencyProvider = pluginDependencyProvider; + mKeyguardDismissUtil = keyguardDismissUtil; mDismissCallbackRegistry = dismissCallbackRegistry; mBubbleExpandListener = @@ -1410,7 +1413,7 @@ public class StatusBar extends SystemUI implements DemoMode, mLightBarController.setBiometricUnlockController(mBiometricUnlockController); mMediaManager.setBiometricUnlockController(mBiometricUnlockController); - Dependency.get(KeyguardDismissUtil.class).setDismissHandler(this::executeWhenUnlocked); + mKeyguardDismissUtil.setDismissHandler(this::executeWhenUnlocked); Trace.endSection(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java index 865936bc3505..eea6ccbe0f97 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java @@ -178,6 +178,7 @@ public class StatusBarModule { DarkIconDispatcher darkIconDispatcher, @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, PluginDependencyProvider pluginDependencyProvider, + KeyguardDismissUtil keyguardDismissUtil, DismissCallbackRegistry dismissCallbackRegistry) { return new StatusBar( context, @@ -256,6 +257,7 @@ public class StatusBarModule { darkIconDispatcher, timeTickHandler, pluginDependencyProvider, + keyguardDismissUtil, dismissCallbackRegistry); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 7040656df9ad..fb05864bf46a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -248,6 +248,7 @@ public class StatusBarTest extends SysuiTestCase { mStatusBarNotificationActivityStarterBuilder; @Mock private DarkIconDispatcher mDarkIconDispatcher; @Mock private PluginDependencyProvider mPluginDependencyProvider; + @Mock private KeyguardDismissUtil mKeyguardDismissUtil; private ShadeController mShadeController; private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); private InitController mInitController = new InitController(); @@ -256,7 +257,6 @@ public class StatusBarTest extends SysuiTestCase { public void setup() throws Exception { MockitoAnnotations.initMocks(this); mDependency.injectTestDependency(NotificationFilter.class, mNotificationFilter); - mDependency.injectMockDependency(KeyguardDismissUtil.class); IPowerManager powerManagerService = mock(IPowerManager.class); mPowerManager = new PowerManager(mContext, powerManagerService, @@ -403,6 +403,7 @@ public class StatusBarTest extends SysuiTestCase { mDarkIconDispatcher, new Handler(TestableLooper.get(this).getLooper()), mPluginDependencyProvider, + mKeyguardDismissUtil, mDismissCallbackRegistry); when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn( -- cgit v1.2.3-59-g8ed1b From facd72f1c0fd333c733bd05e18872cd35815f1e9 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Thu, 26 Dec 2019 15:41:58 -0500 Subject: Pass ExtensionController into StatusBar. Bug: 141882822 Test: atest SystemUITests Change-Id: I5d96586650a1fc6cbfa0c645a306c9ebe1739eff --- .../src/com/android/systemui/statusbar/car/CarStatusBar.java | 3 +++ .../src/com/android/systemui/statusbar/car/CarStatusBarModule.java | 3 +++ .../SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 5 ++++- .../src/com/android/systemui/statusbar/phone/StatusBarModule.java | 3 +++ .../src/com/android/systemui/statusbar/phone/StatusBarTest.java | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 944a52073dde..8da0c806a90b 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -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; diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java index 75f9357843b9..dd87f3709412 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java @@ -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 powerManagerHelperLazy, @@ -283,6 +285,7 @@ public class CarStatusBarModule { timeTickHandler, pluginDependencyProvider, keyguardDismissUtil, + extensionController, dismissCallbackRegistry, carServiceProvider, powerManagerHelperLazy, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index ac28d6d1e433..9775954bfb71 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java index eea6ccbe0f97..5346c43eef08 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java @@ -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); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index fb05864bf46a..a5eabe71428e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -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( -- cgit v1.2.3-59-g8ed1b From fa861bfc4e8c0fb3e7e4192924448249186bfffd Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Thu, 26 Dec 2019 16:04:55 -0500 Subject: Pass UserInfoControllerImpl into StatusBar. Bug: 141882822 Test: atest SystemUITests Change-Id: I5037985026a029c7d00cf63f5adab959ed334637 --- .../src/com/android/systemui/statusbar/car/CarStatusBar.java | 3 +++ .../com/android/systemui/statusbar/car/CarStatusBarModule.java | 3 +++ .../src/com/android/systemui/statusbar/phone/StatusBar.java | 8 ++++---- .../src/com/android/systemui/statusbar/phone/StatusBarModule.java | 3 +++ .../src/com/android/systemui/statusbar/phone/StatusBarTest.java | 3 +++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 8da0c806a90b..77db54c067c6 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -141,6 +141,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 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.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.volume.VolumeComponent; @@ -332,6 +333,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt PluginDependencyProvider pluginDependencyProvider, KeyguardDismissUtil keyguardDismissUtil, ExtensionController extensionController, + UserInfoControllerImpl userInfoControllerImpl, DismissCallbackRegistry dismissCallbackRegistry, /* Car Settings injected components. */ CarServiceProvider carServiceProvider, @@ -418,6 +420,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt pluginDependencyProvider, keyguardDismissUtil, extensionController, + userInfoControllerImpl, dismissCallbackRegistry); mScrimController = scrimController; mLockscreenLockIconController = lockscreenLockIconController; diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java index dd87f3709412..1ebaef702286 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java @@ -99,6 +99,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 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.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.volume.VolumeComponent; @@ -202,6 +203,7 @@ public class CarStatusBarModule { PluginDependencyProvider pluginDependencyProvider, KeyguardDismissUtil keyguardDismissUtil, ExtensionController extensionController, + UserInfoControllerImpl userInfoControllerImpl, DismissCallbackRegistry dismissCallbackRegistry, CarServiceProvider carServiceProvider, Lazy powerManagerHelperLazy, @@ -286,6 +288,7 @@ public class CarStatusBarModule { pluginDependencyProvider, keyguardDismissUtil, extensionController, + userInfoControllerImpl, dismissCallbackRegistry, carServiceProvider, powerManagerHelperLazy, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 9775954bfb71..a6a734a542f0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -128,7 +128,6 @@ import com.android.systemui.ActivityIntentHelper; import com.android.systemui.AutoReinflateContainer; import com.android.systemui.DejankUtils; import com.android.systemui.DemoMode; -import com.android.systemui.Dependency; import com.android.systemui.Dumpable; import com.android.systemui.EventLogTags; import com.android.systemui.InitController; @@ -223,7 +222,6 @@ import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler; import com.android.systemui.statusbar.policy.RemoteInputUriController; -import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.volume.VolumeComponent; @@ -390,6 +388,7 @@ public class StatusBar extends SystemUI implements DemoMode, private final PluginDependencyProvider mPluginDependencyProvider; private final KeyguardDismissUtil mKeyguardDismissUtil; private final ExtensionController mExtensionController; + private final UserInfoControllerImpl mUserInfoControllerImpl; private final DismissCallbackRegistry mDismissCallbackRegistry; // expanded notifications @@ -693,6 +692,7 @@ public class StatusBar extends SystemUI implements DemoMode, PluginDependencyProvider pluginDependencyProvider, KeyguardDismissUtil keyguardDismissUtil, ExtensionController extensionController, + UserInfoControllerImpl userInfoControllerImpl, DismissCallbackRegistry dismissCallbackRegistry) { super(context); mFeatureFlags = featureFlags; @@ -771,6 +771,7 @@ public class StatusBar extends SystemUI implements DemoMode, mPluginDependencyProvider = pluginDependencyProvider; mKeyguardDismissUtil = keyguardDismissUtil; mExtensionController = extensionController; + mUserInfoControllerImpl = userInfoControllerImpl; mDismissCallbackRegistry = dismissCallbackRegistry; mBubbleExpandListener = @@ -1346,8 +1347,7 @@ public class StatusBar extends SystemUI implements DemoMode, mBrightnessMirrorController.onDensityOrFontScaleChanged(); } // TODO: Bring these out of StatusBar. - ((UserInfoControllerImpl) Dependency.get(UserInfoController.class)) - .onDensityOrFontScaleChanged(); + mUserInfoControllerImpl.onDensityOrFontScaleChanged(); mUserSwitcherController.onDensityOrFontScaleChanged(); if (mKeyguardUserSwitcher != null) { mKeyguardUserSwitcher.onDensityOrFontScaleChanged(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java index 5346c43eef08..12033de10cb8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java @@ -77,6 +77,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 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.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.volume.VolumeComponent; @@ -181,6 +182,7 @@ public class StatusBarModule { PluginDependencyProvider pluginDependencyProvider, KeyguardDismissUtil keyguardDismissUtil, ExtensionController extensionController, + UserInfoControllerImpl userInfoControllerImpl, DismissCallbackRegistry dismissCallbackRegistry) { return new StatusBar( context, @@ -261,6 +263,7 @@ public class StatusBarModule { pluginDependencyProvider, keyguardDismissUtil, extensionController, + userInfoControllerImpl, dismissCallbackRegistry); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index a5eabe71428e..1cdba472a085 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -132,6 +132,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 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.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.policy.ZenModeController; import com.android.systemui.util.concurrency.FakeExecutor; @@ -251,6 +252,7 @@ public class StatusBarTest extends SysuiTestCase { @Mock private PluginDependencyProvider mPluginDependencyProvider; @Mock private KeyguardDismissUtil mKeyguardDismissUtil; @Mock private ExtensionController mExtensionController; + @Mock private UserInfoControllerImpl mUserInfoControllerImpl; private ShadeController mShadeController; private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); private InitController mInitController = new InitController(); @@ -407,6 +409,7 @@ public class StatusBarTest extends SysuiTestCase { mPluginDependencyProvider, mKeyguardDismissUtil, mExtensionController, + mUserInfoControllerImpl, mDismissCallbackRegistry); when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn( -- cgit v1.2.3-59-g8ed1b