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

Commit bda7ad88 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Central Surfaces] Add PowerInteractor to CentralSurfacesImpl." into... 

Merge "[Central Surfaces] Add PowerInteractor to CentralSurfacesImpl." into udc-qpr-dev am: 4d2afb56

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516916



Change-Id: Ib28cade9a98456babd61defb553f92e785b92a4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08577c6a 4d2afb56

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

+4 −0
Original line number 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.qs.QS;

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.QSPanelController;

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

    private final ScreenLifecycle mScreenLifecycle;

    private final WakefulnessLifecycle mWakefulnessLifecycle;

    protected final PowerInteractor mPowerInteractor;



    private boolean mNoAnimationOnNextBarModeChange;

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

            ScreenLifecycle screenLifecycle,

            WakefulnessLifecycle wakefulnessLifecycle,

            PowerInteractor powerInteractor,

            SysuiStatusBarStateController statusBarStateController,

            Optional<Bubbles> bubblesOptional,

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

        mScreenLifecycle = screenLifecycle;

        mWakefulnessLifecycle = wakefulnessLifecycle;

        mPowerInteractor = powerInteractor;

        mStatusBarStateController = statusBarStateController;

        mBubblesOptional = bubblesOptional;

        mNoteTaskControllerLazy = noteTaskControllerLazy;

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

+4 −1
Original line number 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.assist.AssistManager;

import com.android.systemui.biometrics.AuthRippleController;

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

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.charging.WiredChargingRippleController;

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.ScreenLifecycle;

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.navigationbar.NavigationBarController;

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.PluginManager;

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.settings.UserTracker;

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

    @Mock private SysuiColorExtractor mColorExtractor;

    private WakefulnessLifecycle mWakefulnessLifecycle;

    @Mock private PowerInteractor mPowerInteractor;

    @Mock private ColorExtractor.GradientColors mGradientColors;

    @Mock private PulseExpansionHandler mPulseExpansionHandler;

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

                mScreenLifecycle,

                mWakefulnessLifecycle,

                mPowerInteractor,

                mStatusBarStateController,

                Optional.of(mBubbles),

                () -> mNoteTaskController,