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

Commit 88233e4c authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b141882822-sb-dependency-get" 

* changes:
  Pass UserInfoControllerImpl into StatusBar.
  Pass ExtensionController into StatusBar.
  Pass KeyguardDismissUtil into StatusBar.
  Pass PluginDependencyProvider into StatusBar.
parents c9777f66 fa861bfc

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

+12 −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;
@@ -117,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;
@@ -134,10 +136,12 @@ 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;

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;
@@ -326,6 +330,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            PluginDependencyProvider pluginDependencyProvider,

            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            DismissCallbackRegistry dismissCallbackRegistry,

            /* Car Settings injected components. */

            CarServiceProvider carServiceProvider,
@@ -409,6 +417,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                initController,

                darkIconDispatcher,

                timeTickHandler,

                pluginDependencyProvider,

                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                dismissCallbackRegistry);

        mScrimController = scrimController;

        mLockscreenLockIconController = lockscreenLockIconController;

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

+12 −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;
@@ -76,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;
@@ -92,10 +94,12 @@ 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;

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;
@@ -196,6 +200,10 @@ public class CarStatusBarModule { 
            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            PluginDependencyProvider pluginDependencyProvider,

            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            DismissCallbackRegistry dismissCallbackRegistry,

            CarServiceProvider carServiceProvider,

            Lazy<PowerManagerHelper> powerManagerHelperLazy,
@@ -277,6 +285,10 @@ public class CarStatusBarModule { 
                initController,

                darkIconDispatcher,

                timeTickHandler,

                pluginDependencyProvider,

                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                dismissCallbackRegistry,

                carServiceProvider,

                powerManagerHelperLazy,

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

+17 −10
Original line number Diff line number Diff line
@@ -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;
@@ -387,6 +385,10 @@ 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 KeyguardDismissUtil mKeyguardDismissUtil;

    private final ExtensionController mExtensionController;

    private final UserInfoControllerImpl mUserInfoControllerImpl;

    private final DismissCallbackRegistry mDismissCallbackRegistry;



    // expanded notifications
@@ -687,6 +689,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            PluginDependencyProvider pluginDependencyProvider,

            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            DismissCallbackRegistry dismissCallbackRegistry) {

        super(context);

        mFeatureFlags = featureFlags;
@@ -762,6 +768,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mKeyguardViewMediatorCallback = viewMediatorCallback;

        mInitController = initController;

        mDarkIconDispatcher = darkIconDispatcher;

        mPluginDependencyProvider = pluginDependencyProvider;

        mKeyguardDismissUtil = keyguardDismissUtil;

        mExtensionController = extensionController;

        mUserInfoControllerImpl = userInfoControllerImpl;

        mDismissCallbackRegistry = dismissCallbackRegistry;



        mBubbleExpandListener =
@@ -995,10 +1005,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 =
@@ -1125,7 +1133,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)
@@ -1339,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();
@@ -1409,7 +1416,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();

    }

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

+11 −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;
@@ -71,10 +72,12 @@ 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;

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;
@@ -176,6 +179,10 @@ public class StatusBarModule { 
            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            PluginDependencyProvider pluginDependencyProvider,

            KeyguardDismissUtil keyguardDismissUtil,

            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            DismissCallbackRegistry dismissCallbackRegistry) {

        return new StatusBar(

                context,
@@ -253,6 +260,10 @@ public class StatusBarModule { 
                initController,

                darkIconDispatcher,

                timeTickHandler,

                pluginDependencyProvider,

                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                dismissCallbackRegistry);

    }

}

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

+11 −1
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;
@@ -126,10 +127,12 @@ 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;

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;
@@ -246,6 +249,10 @@ public class StatusBarTest extends SysuiTestCase { 
    @Mock private StatusBarNotificationActivityStarter.Builder

            mStatusBarNotificationActivityStarterBuilder;

    @Mock private DarkIconDispatcher mDarkIconDispatcher;

    @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();
@@ -254,7 +261,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,
@@ -400,6 +406,10 @@ public class StatusBarTest extends SysuiTestCase { 
                mInitController,

                mDarkIconDispatcher,

                new Handler(TestableLooper.get(this).getLooper()),

                mPluginDependencyProvider,

                mKeyguardDismissUtil,

                mExtensionController,

                mUserInfoControllerImpl,

                mDismissCallbackRegistry);



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