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

Commit fa861bfc authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Pass UserInfoControllerImpl into StatusBar. 

Bug: 141882822
Test: atest SystemUITests

Change-Id: I5037985026a029c7d00cf63f5adab959ed334637
parent facd72f1

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

+3 −0
Original line number Diff line number Diff line
@@ -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;

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

+3 −0
Original line number Diff line number Diff line
@@ -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<PowerManagerHelper> powerManagerHelperLazy,
@@ -286,6 +288,7 @@ public class CarStatusBarModule { 
                pluginDependencyProvider,

                keyguardDismissUtil,

                extensionController,

                userInfoControllerImpl,

                dismissCallbackRegistry,

                carServiceProvider,

                powerManagerHelperLazy,

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

+4 −4
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;
@@ -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();

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

+3 −0
Original line number Diff line number Diff line
@@ -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);

    }

}

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

+3 −0
Original line number Diff line number Diff line
@@ -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(