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

Commit 555279a3 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Central Surfaces] Add PowerInteractor to CentralSurfacesImpl. 

Bug: 277762009
Bug: 277764509
Test: atest CentralSurfacesImplTest

Change-Id: I7151dbced5dd1e857c798ab58504fc495c0ad8fc
parent 50656ddb

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,7 @@ import com.android.systemui.plugins.PluginListener; 
import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.plugins.qs.QS;

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

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

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.qs.QSFragment;

import com.android.systemui.qs.QSFragment;

import com.android.systemui.qs.QSPanelController;

import com.android.systemui.qs.QSPanelController;

import com.android.systemui.recents.ScreenPinningRequest;

import com.android.systemui.recents.ScreenPinningRequest;
@@ -634,6 +635,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
    private final SysuiColorExtractor mColorExtractor;

    private final SysuiColorExtractor mColorExtractor;

    private final ScreenLifecycle mScreenLifecycle;

    private final ScreenLifecycle mScreenLifecycle;

    private final WakefulnessLifecycle mWakefulnessLifecycle;

    private final WakefulnessLifecycle mWakefulnessLifecycle;

    protected final PowerInteractor mPowerInteractor;





    private boolean mNoAnimationOnNextBarModeChange;

    private boolean mNoAnimationOnNextBarModeChange;

    private final SysuiStatusBarStateController mStatusBarStateController;

    private final SysuiStatusBarStateController mStatusBarStateController;
@@ -735,6 +737,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            SysuiColorExtractor colorExtractor,

            SysuiColorExtractor colorExtractor,

            ScreenLifecycle screenLifecycle,

            ScreenLifecycle screenLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,

            PowerInteractor powerInteractor,

            SysuiStatusBarStateController statusBarStateController,

            SysuiStatusBarStateController statusBarStateController,

            Optional<Bubbles> bubblesOptional,

            Optional<Bubbles> bubblesOptional,

            Lazy<NoteTaskController> noteTaskControllerLazy,

            Lazy<NoteTaskController> noteTaskControllerLazy,
@@ -831,6 +834,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mColorExtractor = colorExtractor;

        mColorExtractor = colorExtractor;

        mScreenLifecycle = screenLifecycle;

        mScreenLifecycle = screenLifecycle;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mPowerInteractor = powerInteractor;

        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = statusBarStateController;

        mBubblesOptional = bubblesOptional;

        mBubblesOptional = bubblesOptional;

        mNoteTaskControllerLazy = noteTaskControllerLazy;

        mNoteTaskControllerLazy = noteTaskControllerLazy;

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ import com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenu 
import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.biometrics.AuthRippleController;

import com.android.systemui.biometrics.AuthRippleController;

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.charging.WiredChargingRippleController;

import com.android.systemui.charging.WiredChargingRippleController;

import com.android.systemui.classifier.FalsingCollectorFake;

import com.android.systemui.classifier.FalsingCollectorFake;
@@ -113,7 +114,6 @@ import com.android.systemui.keyguard.KeyguardUnlockAnimationController; 
import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel;

import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.notetask.NoteTaskController;

import com.android.systemui.notetask.NoteTaskController;
@@ -122,6 +122,7 @@ import com.android.systemui.plugins.ActivityStarter.OnDismissAction; 
import com.android.systemui.plugins.PluginDependencyProvider;

import com.android.systemui.plugins.PluginDependencyProvider;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.PluginManager;

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

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

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.recents.ScreenPinningRequest;

import com.android.systemui.recents.ScreenPinningRequest;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.settings.brightness.BrightnessSliderController;

import com.android.systemui.settings.brightness.BrightnessSliderController;
@@ -259,6 +260,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
    @Mock private AccessibilityFloatingMenuController mAccessibilityFloatingMenuController;

    @Mock private AccessibilityFloatingMenuController mAccessibilityFloatingMenuController;

    @Mock private SysuiColorExtractor mColorExtractor;

    @Mock private SysuiColorExtractor mColorExtractor;

    private WakefulnessLifecycle mWakefulnessLifecycle;

    private WakefulnessLifecycle mWakefulnessLifecycle;

    @Mock private PowerInteractor mPowerInteractor;

    @Mock private ColorExtractor.GradientColors mGradientColors;

    @Mock private ColorExtractor.GradientColors mGradientColors;

    @Mock private PulseExpansionHandler mPulseExpansionHandler;

    @Mock private PulseExpansionHandler mPulseExpansionHandler;

    @Mock private NotificationWakeUpCoordinator mNotificationWakeUpCoordinator;

    @Mock private NotificationWakeUpCoordinator mNotificationWakeUpCoordinator;
@@ -490,6 +492,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
                mColorExtractor,

                mColorExtractor,

                mScreenLifecycle,

                mScreenLifecycle,

                mWakefulnessLifecycle,

                mWakefulnessLifecycle,

                mPowerInteractor,

                mStatusBarStateController,

                mStatusBarStateController,

                Optional.of(mBubbles),

                Optional.of(mBubbles),

                () -> mNoteTaskController,

                () -> mNoteTaskController,