From 265b9139e01e0f81242b4ca27ecdbb47bda85dae Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 30 Apr 2023 21:59:15 -0600 Subject: android: Fix inline keyboard input --- .../java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt index 974e8b7a8..0070de36a 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt @@ -147,17 +147,19 @@ open class EmulationActivity : AppCompatActivity(), SensorEventListener { } override fun dispatchKeyEvent(event: KeyEvent): Boolean { - // Handling the case where the back button is pressed. - if (event.keyCode == KeyEvent.KEYCODE_BACK) { - onBackPressedDispatcher.onBackPressed() - return true + if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK && + event.source and InputDevice.SOURCE_GAMEPAD != InputDevice.SOURCE_GAMEPAD + ) { + return super.dispatchKeyEvent(event) } return inputHandler.dispatchKeyEvent(event) } override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { - if (event.source and InputDevice.SOURCE_CLASS_JOYSTICK === 0) { + if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK && + event.source and InputDevice.SOURCE_GAMEPAD != InputDevice.SOURCE_GAMEPAD + ) { return super.dispatchGenericMotionEvent(event) } -- cgit v1.2.3