[Central Surfaces] Move NotifShadeWVC wake to PowerInteractor.
Bug: 277764509 Test: Have UDFPS enrolled; put device in lockdown mode (Power menu -> lockdown) -> go to AOD -> hold down on fingerprint sensor -> verify PowerInteractor notified and device wakes Test: atest NotificationShadeWindowViewTest NotificationShadeWindowViewControllerTest Change-Id: I2f85f5b5551f58c679f718ea4755c10811f1686b
This commit is contained in:
@@ -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.MultiShadeMotionEventInteractor;
|
||||
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.statusbar.DragDownHelper;
|
||||
import com.android.systemui.statusbar.LockscreenShadeTransitionController;
|
||||
@@ -113,6 +114,7 @@ public class NotificationShadeWindowViewController {
|
||||
private PhoneStatusBarViewController mStatusBarViewController;
|
||||
private final CentralSurfaces mService;
|
||||
private final BackActionInteractor mBackActionInteractor;
|
||||
private final PowerInteractor mPowerInteractor;
|
||||
private final NotificationShadeWindowController mNotificationShadeWindowController;
|
||||
private DragDownHelper mDragDownHelper;
|
||||
private boolean mExpandingBelowNotch;
|
||||
@@ -147,6 +149,7 @@ public class NotificationShadeWindowViewController {
|
||||
LockIconViewController lockIconViewController,
|
||||
CentralSurfaces centralSurfaces,
|
||||
BackActionInteractor backActionInteractor,
|
||||
PowerInteractor powerInteractor,
|
||||
NotificationShadeWindowController controller,
|
||||
Optional<UnfoldTransitionProgressProvider> unfoldTransitionProgressProvider,
|
||||
KeyguardUnlockAnimationController keyguardUnlockAnimationController,
|
||||
@@ -179,6 +182,7 @@ public class NotificationShadeWindowViewController {
|
||||
mBackActionInteractor = backActionInteractor;
|
||||
mLockIconViewController.init();
|
||||
mService = centralSurfaces;
|
||||
mPowerInteractor = powerInteractor;
|
||||
mNotificationShadeWindowController = controller;
|
||||
mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;
|
||||
mAmbientState = ambientState;
|
||||
@@ -311,8 +315,7 @@ public class NotificationShadeWindowViewController {
|
||||
/* onGestureDetectedRunnable */
|
||||
() -> {
|
||||
mService.userActivity();
|
||||
mService.wakeUpIfDozing(
|
||||
mClock.uptimeMillis(),
|
||||
mPowerInteractor.wakeUpIfDozing(
|
||||
"LOCK_ICON_TOUCH",
|
||||
PowerManager.WAKE_REASON_GESTURE);
|
||||
}
|
||||
|
||||
@@ -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.domain.interactor.MultiShadeInteractor
|
||||
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.statusbar.LockscreenShadeTransitionController
|
||||
import com.android.systemui.statusbar.NotificationInsetsController
|
||||
@@ -93,6 +94,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
|
||||
@Mock private lateinit var sysuiStatusBarStateController: SysuiStatusBarStateController
|
||||
@Mock private lateinit var centralSurfaces: CentralSurfaces
|
||||
@Mock private lateinit var backActionInteractor: BackActionInteractor
|
||||
@Mock private lateinit var powerInteractor: PowerInteractor
|
||||
@Mock private lateinit var dockManager: DockManager
|
||||
@Mock private lateinit var notificationPanelViewController: NotificationPanelViewController
|
||||
@Mock private lateinit var notificationShadeDepthController: NotificationShadeDepthController
|
||||
@@ -174,6 +176,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
|
||||
lockIconViewController,
|
||||
centralSurfaces,
|
||||
backActionInteractor,
|
||||
powerInteractor,
|
||||
notificationShadeWindowController,
|
||||
unfoldTransitionProgressProvider,
|
||||
keyguardUnlockAnimationController,
|
||||
|
||||
@@ -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.domain.interactor.MultiShadeInteractor
|
||||
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.statusbar.DragDownHelper
|
||||
import com.android.systemui.statusbar.LockscreenShadeTransitionController
|
||||
@@ -95,6 +96,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
|
||||
@Mock private lateinit var shadeController: ShadeController
|
||||
@Mock private lateinit var centralSurfaces: CentralSurfaces
|
||||
@Mock private lateinit var backActionInteractor: BackActionInteractor
|
||||
@Mock private lateinit var powerInteractor: PowerInteractor
|
||||
@Mock private lateinit var dockManager: DockManager
|
||||
@Mock private lateinit var notificationPanelViewController: NotificationPanelViewController
|
||||
@Mock private lateinit var notificationStackScrollLayout: NotificationStackScrollLayout
|
||||
@@ -187,6 +189,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
|
||||
lockIconViewController,
|
||||
centralSurfaces,
|
||||
backActionInteractor,
|
||||
powerInteractor,
|
||||
notificationShadeWindowController,
|
||||
unfoldTransitionProgressProvider,
|
||||
keyguardUnlockAnimationController,
|
||||
|
||||
Reference in New Issue
Block a user