diff options
2 files changed, 2 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt index 55b420b06413..82c28ff4cffb 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt @@ -60,7 +60,6 @@ constructor( return collapseShadeLockedOrShowPrimaryBouncer() } } - when (event.keyCode) { KeyEvent.KEYCODE_MENU -> return dispatchMenuKeyEvent() } @@ -98,7 +97,8 @@ constructor( (statusBarStateController.state != StatusBarState.SHADE) && statusBarKeyguardViewManager.shouldDismissOnMenuPressed() if (shouldUnlockOnMenuPressed) { - return collapseShadeLockedOrShowPrimaryBouncer() + shadeController.animateCollapseShadeForced() + return true } return false } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt index 6cd74063b39c..13f30f560cdf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt @@ -130,15 +130,6 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { } @Test - fun dispatchKeyEvent_menuActionUp_awakeKeyguard_showsPrimaryBouncer() { - powerInteractor.setAwakeForTest() - whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD) - whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true) - - verifyActionUpShowsPrimaryBouncer(KeyEvent.KEYCODE_MENU) - } - - @Test fun dispatchKeyEvent_menuActionUp_awakeShadeLocked_collapsesShade() { powerInteractor.setAwakeForTest() whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED) |