Merge "Process adb shell input keyevent 82 through dismiss" into main (02e6e665) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt

+8 −5

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import org.mockito.Mockito.clearInvocations
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verify
		import org.mockito.junit.MockitoJUnit
		import org.mockito.kotlin.isNull

		@ExperimentalCoroutinesApi
		@SmallTest
		@@ -96,7 +97,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() {
		.sendVolumeKeyEvent(
		eq(actionDownVolumeDownKeyEvent),
		eq(AudioManager.USE_DEFAULT_STREAM_TYPE),
		eq(true)
		eq(true),
		)

		assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isTrue()
		@@ -104,7 +105,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() {
		.sendVolumeKeyEvent(
		eq(actionDownVolumeUpKeyEvent),
		eq(AudioManager.USE_DEFAULT_STREAM_TYPE),
		eq(true)
		eq(true),
		)
		}

		@@ -117,7 +118,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() {
		.sendVolumeKeyEvent(
		eq(actionDownVolumeDownKeyEvent),
		eq(AudioManager.USE_DEFAULT_STREAM_TYPE),
		eq(true)
		eq(true),
		)

		assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isFalse()
		@@ -125,7 +126,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() {
		.sendVolumeKeyEvent(
		eq(actionDownVolumeUpKeyEvent),
		eq(AudioManager.USE_DEFAULT_STREAM_TYPE),
		eq(true)
		eq(true),
		)
		}

		@@ -135,7 +136,9 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() {
		whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED)
		whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true)

		verifyActionUpCollapsesTheShade(KeyEvent.KEYCODE_MENU)
		val actionUpMenuKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU)
		assertThat(underTest.dispatchKeyEvent(actionUpMenuKeyEvent)).isTrue()
		verify(statusBarKeyguardViewManager).dismissWithAction(any(), isNull(), eq(false))
		}

		@Test

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt

+10 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import com.android.systemui.back.domain.interactor.BackActionInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyevent.domain.interactor.SysUIKeyEventHandler.Companion.handleAction
		import com.android.systemui.media.controls.util.MediaSessionLegacyHelperWrapper
		import com.android.systemui.plugins.ActivityStarter.OnDismissAction
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.power.domain.interactor.PowerInteractor
		import com.android.systemui.shade.ShadeController
		@@ -105,7 +106,15 @@ constructor(
		(statusBarStateController.state != StatusBarState.SHADE) &&
		statusBarKeyguardViewManager.shouldDismissOnMenuPressed()
		if (shouldUnlockOnMenuPressed) {
		shadeController.animateCollapseShadeForced()
		statusBarKeyguardViewManager.dismissWithAction(
		object : OnDismissAction {
		override fun onDismiss(): Boolean {
		return false
		}
		},
		null,
		false,
		)
		return true
		}
		return false