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

Commit 90595e40 authored by Justin Weir's avatar Justin Weir
Browse files

Add ShadeController to KeyguardViewMediator 

ShadeController is not used yet, but adding the member var as a
standalone CL will allow ag/20355131 to automerge without conflicts
and save us some code review effort.

Bug: 249277686
Test: presubmits
Change-Id: I9cb717410e32c1f2da2711c91f532ab05c0b410b
Merged-In: I9cb717410e32c1f2da2711c91f532ab05c0b410b
parent 93267c39

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ import com.android.systemui.keyguard.dagger.KeyguardModule; 
import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shade.NotificationPanelViewController;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;
@@ -266,6 +267,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
    private final Executor mUiBgExecutor;

    private final ScreenOffAnimationController mScreenOffAnimationController;

    private final Lazy<NotificationShadeDepthController> mNotificationShadeDepthController;

    private final Lazy<ShadeController> mShadeController;



    private boolean mSystemReady;

    private boolean mBootCompleted;
@@ -1149,6 +1151,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
            ScreenOnCoordinator screenOnCoordinator,

            InteractionJankMonitor interactionJankMonitor,

            DreamOverlayStateController dreamOverlayStateController,

            Lazy<ShadeController> shadeControllerLazy,

            Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy,

            Lazy<ActivityLaunchAnimator> activityLaunchAnimator) {

        mContext = context;
@@ -1164,6 +1167,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        mTrustManager = trustManager;

        mUserSwitcherController = userSwitcherController;

        mKeyguardDisplayManager = keyguardDisplayManager;

        mShadeController = shadeControllerLazy;

        dumpManager.registerDumpable(getClass().getName(), this);

        mDeviceConfig = deviceConfig;

        mScreenOnCoordinator = screenOnCoordinator;

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.keyguard.data.repository.KeyguardRepositoryModule; 
import com.android.systemui.keyguard.domain.interactor.StartKeyguardTransitionModule;

import com.android.systemui.keyguard.domain.quickaffordance.KeyguardQuickAffordanceModule;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;
@@ -108,6 +109,7 @@ public class KeyguardModule { 
            ScreenOnCoordinator screenOnCoordinator,

            InteractionJankMonitor interactionJankMonitor,

            DreamOverlayStateController dreamOverlayStateController,

            Lazy<ShadeController> shadeController,

            Lazy<NotificationShadeWindowController> notificationShadeWindowController,

            Lazy<ActivityLaunchAnimator> activityLaunchAnimator) {

        return new KeyguardViewMediator(
@@ -135,6 +137,7 @@ public class KeyguardModule { 
                screenOnCoordinator,

                interactionJankMonitor,

                dreamOverlayStateController,

                shadeController,

                notificationShadeWindowController,

                activityLaunchAnimator);

    }

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.systemui.classifier.FalsingCollectorFake; 
import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;
@@ -105,6 +106,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
    private @Mock ScreenOffAnimationController mScreenOffAnimationController;

    private @Mock InteractionJankMonitor mInteractionJankMonitor;

    private @Mock ScreenOnCoordinator mScreenOnCoordinator;

    private @Mock ShadeController mShadeController;

    private @Mock Lazy<NotificationShadeWindowController> mNotificationShadeWindowControllerLazy;

    private @Mock DreamOverlayStateController mDreamOverlayStateController;

    private @Mock ActivityLaunchAnimator mActivityLaunchAnimator;
@@ -307,6 +309,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
                mScreenOnCoordinator,

                mInteractionJankMonitor,

                mDreamOverlayStateController,

                () -> mShadeController,

                mNotificationShadeWindowControllerLazy,

                () -> mActivityLaunchAnimator);

        mViewMediator.start();