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

Commit 003718b4 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Pass KeyguardDismissUtil into StatusBar. 

Bug: 141882822
Test: atest SystemUITests

Change-Id: Icd9fb0254dfb392fc7803064c5ec09add4dc07d7
parent 2c2ba3c7

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

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

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

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

                timeTickHandler,

                pluginDependencyProvider,

                keyguardDismissUtil,

                dismissCallbackRegistry,

                carServiceProvider,

                powerManagerHelperLazy,

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

+4 −1
Original line number Diff line number Diff line
@@ -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();

    }

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

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

    }

}

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

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