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

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

[Central Surfaces] Move NotifShadeWVC wake to PowerInteractor. am: 31ec6e81

parents 7573e966 31ec6e81
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.systemui.log.BouncerLogger;
import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor;
import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor;
import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor;
import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor;
import com.android.systemui.multishade.ui.view.MultiShadeView;
import com.android.systemui.multishade.ui.view.MultiShadeView;
import com.android.systemui.power.domain.interactor.PowerInteractor;
import com.android.systemui.shared.animation.DisableSubpixelTextTransitionListener;
import com.android.systemui.shared.animation.DisableSubpixelTextTransitionListener;
import com.android.systemui.statusbar.DragDownHelper;
import com.android.systemui.statusbar.DragDownHelper;
import com.android.systemui.statusbar.LockscreenShadeTransitionController;
import com.android.systemui.statusbar.LockscreenShadeTransitionController;
@@ -113,6 +114,7 @@ public class NotificationShadeWindowViewController {
    private PhoneStatusBarViewController mStatusBarViewController;
    private PhoneStatusBarViewController mStatusBarViewController;
    private final CentralSurfaces mService;
    private final CentralSurfaces mService;
    private final BackActionInteractor mBackActionInteractor;
    private final BackActionInteractor mBackActionInteractor;
    private final PowerInteractor mPowerInteractor;
    private final NotificationShadeWindowController mNotificationShadeWindowController;
    private final NotificationShadeWindowController mNotificationShadeWindowController;
    private DragDownHelper mDragDownHelper;
    private DragDownHelper mDragDownHelper;
    private boolean mExpandingBelowNotch;
    private boolean mExpandingBelowNotch;
@@ -147,6 +149,7 @@ public class NotificationShadeWindowViewController {
            LockIconViewController lockIconViewController,
            LockIconViewController lockIconViewController,
            CentralSurfaces centralSurfaces,
            CentralSurfaces centralSurfaces,
            BackActionInteractor backActionInteractor,
            BackActionInteractor backActionInteractor,
            PowerInteractor powerInteractor,
            NotificationShadeWindowController controller,
            NotificationShadeWindowController controller,
            Optional<UnfoldTransitionProgressProvider> unfoldTransitionProgressProvider,
            Optional<UnfoldTransitionProgressProvider> unfoldTransitionProgressProvider,
            KeyguardUnlockAnimationController keyguardUnlockAnimationController,
            KeyguardUnlockAnimationController keyguardUnlockAnimationController,
@@ -179,6 +182,7 @@ public class NotificationShadeWindowViewController {
        mBackActionInteractor = backActionInteractor;
        mBackActionInteractor = backActionInteractor;
        mLockIconViewController.init();
        mLockIconViewController.init();
        mService = centralSurfaces;
        mService = centralSurfaces;
        mPowerInteractor = powerInteractor;
        mNotificationShadeWindowController = controller;
        mNotificationShadeWindowController = controller;
        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;
        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;
        mAmbientState = ambientState;
        mAmbientState = ambientState;
@@ -311,8 +315,7 @@ public class NotificationShadeWindowViewController {
                        /* onGestureDetectedRunnable */
                        /* onGestureDetectedRunnable */
                        () -> {
                        () -> {
                            mService.userActivity();
                            mService.userActivity();
                            mService.wakeUpIfDozing(
                            mPowerInteractor.wakeUpIfDozing(
                                    mClock.uptimeMillis(),
                                    "LOCK_ICON_TOUCH",
                                    "LOCK_ICON_TOUCH",
                                    PowerManager.WAKE_REASON_GESTURE);
                                    PowerManager.WAKE_REASON_GESTURE);
                        }
                        }
+3 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.systemui.multishade.data.remoteproxy.MultiShadeInputProxy
import com.android.systemui.multishade.data.repository.MultiShadeRepository
import com.android.systemui.multishade.data.repository.MultiShadeRepository
import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor
import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor
import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor
import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor
import com.android.systemui.power.domain.interactor.PowerInteractor
import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler
import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler
import com.android.systemui.statusbar.LockscreenShadeTransitionController
import com.android.systemui.statusbar.LockscreenShadeTransitionController
import com.android.systemui.statusbar.NotificationInsetsController
import com.android.systemui.statusbar.NotificationInsetsController
@@ -93,6 +94,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
    @Mock private lateinit var sysuiStatusBarStateController: SysuiStatusBarStateController
    @Mock private lateinit var sysuiStatusBarStateController: SysuiStatusBarStateController
    @Mock private lateinit var centralSurfaces: CentralSurfaces
    @Mock private lateinit var centralSurfaces: CentralSurfaces
    @Mock private lateinit var backActionInteractor: BackActionInteractor
    @Mock private lateinit var backActionInteractor: BackActionInteractor
    @Mock private lateinit var powerInteractor: PowerInteractor
    @Mock private lateinit var dockManager: DockManager
    @Mock private lateinit var dockManager: DockManager
    @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController
    @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController
    @Mock private lateinit var notificationShadeDepthController: NotificationShadeDepthController
    @Mock private lateinit var notificationShadeDepthController: NotificationShadeDepthController
@@ -174,6 +176,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
                lockIconViewController,
                lockIconViewController,
                centralSurfaces,
                centralSurfaces,
                backActionInteractor,
                backActionInteractor,
                powerInteractor,
                notificationShadeWindowController,
                notificationShadeWindowController,
                unfoldTransitionProgressProvider,
                unfoldTransitionProgressProvider,
                keyguardUnlockAnimationController,
                keyguardUnlockAnimationController,
+3 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.systemui.multishade.data.remoteproxy.MultiShadeInputProxy
import com.android.systemui.multishade.data.repository.MultiShadeRepository
import com.android.systemui.multishade.data.repository.MultiShadeRepository
import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor
import com.android.systemui.multishade.domain.interactor.MultiShadeInteractor
import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor
import com.android.systemui.multishade.domain.interactor.MultiShadeMotionEventInteractor
import com.android.systemui.power.domain.interactor.PowerInteractor
import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler
import com.android.systemui.shade.NotificationShadeWindowView.InteractionEventHandler
import com.android.systemui.statusbar.DragDownHelper
import com.android.systemui.statusbar.DragDownHelper
import com.android.systemui.statusbar.LockscreenShadeTransitionController
import com.android.systemui.statusbar.LockscreenShadeTransitionController
@@ -95,6 +96,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
    @Mock private lateinit var shadeController: ShadeController
    @Mock private lateinit var shadeController: ShadeController
    @Mock private lateinit var centralSurfaces: CentralSurfaces
    @Mock private lateinit var centralSurfaces: CentralSurfaces
    @Mock private lateinit var backActionInteractor: BackActionInteractor
    @Mock private lateinit var backActionInteractor: BackActionInteractor
    @Mock private lateinit var powerInteractor: PowerInteractor
    @Mock private lateinit var dockManager: DockManager
    @Mock private lateinit var dockManager: DockManager
    @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController
    @Mock private lateinit var notificationPanelViewController: NotificationPanelViewController
    @Mock private lateinit var notificationStackScrollLayout: NotificationStackScrollLayout
    @Mock private lateinit var notificationStackScrollLayout: NotificationStackScrollLayout
@@ -187,6 +189,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
                lockIconViewController,
                lockIconViewController,
                centralSurfaces,
                centralSurfaces,
                backActionInteractor,
                backActionInteractor,
                powerInteractor,
                notificationShadeWindowController,
                notificationShadeWindowController,
                unfoldTransitionProgressProvider,
                unfoldTransitionProgressProvider,
                keyguardUnlockAnimationController,
                keyguardUnlockAnimationController,