mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 13:55:58 +00:00
fix(input): system Back only turns into a right-click with an external mouse (#2323)
* fix(input): injected Back is a right-click only while an external mouse is attached * input: order imports * fix(input): reject built-in devices for injected Back * fix(input): log matched mouse for injected Back * fix(input): ignore mice that name themselves virtual for injected Back
This commit is contained in:
1 parent
40242fa082
commit
9bf638a3c4
3 files changed
+85
-3
No files matched your search
@@ -8,6 +8,7 @@ import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.shadows.InputDeviceBuilder
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [34], manifest = Config.NONE)
|
||||
@@ -151,4 +152,47 @@ class MouseBackInputTest {
|
||||
assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_UP), toGuest = true))
|
||||
assertTrue(presses.isEmpty())
|
||||
}
|
||||
|
||||
private fun device(name: String, sources: Int, external: Boolean = true, virtual: Boolean = false) =
|
||||
InputDeviceBuilder.newBuilder().setId(if (virtual) -1 else 11).setName(name).setDescriptor(name)
|
||||
.setExternal(external).setSources(sources).build()
|
||||
|
||||
@Test fun anExternalMouseCounts() {
|
||||
assertTrue(MouseBackInput.isExternalMouse(device("USB mouse", InputDevice.SOURCE_MOUSE)))
|
||||
assertTrue(MouseBackInput.isExternalMouse(device("Bluetooth mouse", InputDevice.SOURCE_MOUSE_RELATIVE)))
|
||||
}
|
||||
|
||||
@Test fun theLoggedControllerDeviceDoesNotCountAsAnExternalMouse() {
|
||||
val odinController = device("Odin Controller", 0x1000511)
|
||||
assertTrue(PadBridge.isFromController(odinController))
|
||||
assertFalse(MouseBackInput.isExternalMouse(odinController))
|
||||
}
|
||||
|
||||
@Test fun virtualTouchpadTouchscreenUinputAndNonMouseDevicesDoNotCount() {
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("virtual mouse", InputDevice.SOURCE_MOUSE, virtual = true)))
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("touchpad", InputDevice.SOURCE_MOUSE or InputDevice.SOURCE_TOUCHPAD)))
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("touchscreen", InputDevice.SOURCE_MOUSE or InputDevice.SOURCE_TOUCHSCREEN)))
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("uinput-mouse", InputDevice.SOURCE_MOUSE)))
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("gamepad", InputDevice.SOURCE_GAMEPAD)))
|
||||
assertFalse(MouseBackInput.isExternalMouse(null))
|
||||
}
|
||||
|
||||
@Test fun aMouseThatNamesItselfVirtualDoesNotCount() {
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("ODIN Station Virtual Mouse", 0x20004)))
|
||||
assertFalse(MouseBackInput.isExternalMouse(device("VIRTUAL pointer", InputDevice.SOURCE_MOUSE)))
|
||||
assertTrue(MouseBackInput.isExternalMouse(device("Virtuality Pro Mouse", InputDevice.SOURCE_MOUSE)))
|
||||
assertTrue(MouseBackInput.isExternalMouse(device("Logitech MX Master 3", InputDevice.SOURCE_MOUSE)))
|
||||
}
|
||||
|
||||
@Test fun injectedBackIsLeftAloneWithoutAnExternalMouse() {
|
||||
val odinController = device("Odin Controller", 0x1000511)
|
||||
val controllerOnly = MouseBackInput(presses::add) { MouseBackInput.isExternalMouse(odinController) }
|
||||
assertFalse(controllerOnly.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true))
|
||||
assertTrue(presses.isEmpty())
|
||||
val external = MouseBackInput(presses::add) {
|
||||
MouseBackInput.isExternalMouse(device("USB mouse", InputDevice.SOURCE_MOUSE))
|
||||
}
|
||||
assertTrue(external.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true))
|
||||
assertEquals(listOf(true), presses)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user