diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f8e0fb414b..9f9284b92f 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -191,6 +191,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var unfoldedPanel by mutableStateOf(null) private var unfoldedColumn: android.widget.LinearLayout? = null private var unfoldedDeckSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null + private var swappedInputSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null private var unfoldedDeckPanel by mutableStateOf(null) private var deckPanelLayouts: Map = emptyMap() private lateinit var sessionRoot: FrameLayout @@ -200,6 +201,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde @Volatile private var inputUsesLocalActions = false private var inputUsesPointer = false private var inputProfile = InputProfile.defaults(InputProfile.GAME) + private var stockInputProfile = InputProfile.defaults(InputProfile.GAME) private val inputMotion = InputMotion { inputRouter } private val heldKeys = HeldInput { code, down -> WaylandCompositor.nativeSendKey(code, if (down) 1 else 0) } private val heldButtons = HeldInput(::sendSceneButton) @@ -893,6 +895,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde drawnRect()?.let { forwardTouch(event, it) } } override fun rightClick(x: Float, y: Float) { + if (!screenTapsClick) return pointerListener.onLongPress() pointerListener.onButton(PointerGestures.BTN_RIGHT, true, x, y) surfaceView.postDelayed({ pointerListener.onButton(PointerGestures.BTN_RIGHT, false, x, y) }, 50L) @@ -4278,6 +4281,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val library = com.droiddeck.launcher.input.InputLibraries.read(this) val desktop = loadingMode() == SessionService.MODE_DESKTOP inputProfile = library.compileActive(desktop, secondScreenMode.panel(this)) + stockInputProfile = library.compileStock(desktop, secondScreenMode.panel(this)) primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY) adaptiveSticks = primaryInputLayout?.adaptiveSticks quickButtons = primaryInputLayout?.takeIf { it.editable }?.let { l -> l.quickButtons.associateWith { it !in l.style.hidden } }.orEmpty() @@ -4735,6 +4739,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var lockedSwipeY = 0f private var dismissTouch = false private var sessionTouchDown = false + private var screenTapsClick = true + + private fun onScreenMouseButtonShown(): Boolean = listOfNotNull( + onScreenControls?.inputSurface, bottomInputControls?.inputSurface, unfoldedPanel?.inputSurface, unfoldedDeckSurface, + secondScreenPresentation?.controlsView, swappedInputSurface, + ).any { it.isShown && inputProfile.showsMouseButton(it.inputRole, it.shownElements, stockInputProfile) } override fun onTouchEvent(event: MotionEvent): Boolean { val pen = PenStream.penIndex(event) @@ -4767,6 +4777,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } val snapshot = fingerTouchSnapshot(uiBlocking) val route = com.droiddeck.launcher.input.TouchRouter.decide(snapshot) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + screenTapsClick = !onScreenMouseButtonShown() + if (::touchpad.isInitialized) touchpad.clicks = screenTapsClick + if (::scrollTouch.isInitialized) scrollTouch.clicks = screenTapsClick + } if (route != touchRoute) { Log.i(TAG, "touch route $touchRoute -> $route (mode=$routedTouchMode steamUi=${SessionState.steamUi} scrollLayer=$scrollTouchGesture)") touchRoute = route @@ -4916,6 +4931,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) ignoreGameTouch = false return true } + // With an on-screen mouse button the press comes from the button, so the pointer has to be there before + // the two-finger gesture buffer holds the touch-down. + if (SessionState.mode == SessionService.MODE_DESKTOP && !screenTapsClick && !pointerLocked && + event.actionMasked == MotionEvent.ACTION_DOWN) movePointer(event.x, event.y) if (SessionState.mode == SessionService.MODE_DESKTOP && twoFingerGestures.onTouch(event)) return true return forwardTouch(event, rect) } @@ -4950,7 +4969,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } } - directTouchHold.onTouch(event) + if (screenTapsClick) directTouchHold.onTouch(event) + else if (!pointerLocked && (event.actionMasked == MotionEvent.ACTION_DOWN || event.actionMasked == MotionEvent.ACTION_MOVE)) + movePointer(event.x, event.y) return true } @@ -6045,8 +6066,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde androidx.compose.runtime.key(profileLayout) { androidx.compose.ui.viewinterop.AndroidView( factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge, profileLayout?.elements.orEmpty(), - surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) }, + surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()).also { swappedInputSurface = it } }, modifier = Modifier.fillMaxWidth().weight(1f), + onRelease = { if (swappedInputSurface === it) swappedInputSurface = null }, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index cc6313dc30..0e5ed4261f 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -97,6 +97,16 @@ data class InputLibrary( fun compileActive(isDesktop: Boolean, panel: String? = null): InputProfile = compileParts(activeId(isDesktop), InputRole.entries.associateWith { preset(if (it == InputRole.SECONDARY) panelPart(isDesktop, panel).bindings else activePart(isDesktop, it).bindings) }) + fun compileStock(isDesktop: Boolean, panel: String? = null): InputProfile { + val defaults = InputProfile.defaults(profile(activeId(isDesktop)).base) + val stock = InputStockLayouts.presets(InputStockLayouts.layouts()) + return compileParts(defaults.id, InputRole.entries.associateWith { role -> + val part = if (role == InputRole.SECONDARY) panelPart(isDesktop, panel) else activePart(isDesktop, role) + val origin = layouts.firstOrNull { it.id == part.layout }?.origin ?: part.layout + stock.firstOrNull { it.id == part.bindings || (origin != null && it.layoutId == origin) } + ?: SavedInputBindings(part.bindings, "", role == InputRole.PHYSICAL, part.layout, defaults.bindings[role].orEmpty()) + }) + } fun saveSelection(isDesktop: Boolean, name: String, id: String = newInputId()): InputLibrary { val current = profile(activeId(isDesktop)) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt index 2375cf34e8..a122766271 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt @@ -53,6 +53,16 @@ data class InputProfile( fun elementClickAction(role: InputRole, element: InputSurfaceElement): InputAction = clicks[role]?.get(element.id) ?: defaultElementClick(element, elementAction(role, element.id, element.control)) { action(role, it) } + fun showsMouseButton(role: InputRole, shown: List, stock: InputProfile): Boolean = shown.any { element -> + val action = elementAction(role, element.id, element.control).takeIf { + elements[role]?.get(element.id) != stock.elements[role]?.get(element.id) || it != stock.elementAction(role, element.id, element.control) + } + val click = elementClickAction(role, element).takeIf { + clicks[role]?.get(element.id) != stock.clicks[role]?.get(element.id) || it != stock.elementClickAction(role, element) + } + listOfNotNull(action, click).any { it is InputAction.MouseButton && it.validFor(element.control) } + } + companion object { const val GAME = "game" const val DESKTOP = "desktop" diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index 4923221fa0..ee3a6560ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -32,6 +32,7 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo var isPinnedOnly = false private set val hasPinned get() = layout?.elements?.any { it.alwaysShown } == true + val inputSurface: com.droiddeck.launcher.ui.InputSurfaceView get() = surface var onTouchMiss: ((MotionEvent) -> Unit)? get() = surface.onTouchMiss set(value) { surface.onTouchMiss = value } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt index 4f1ebc9bdd..06da1bae21 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt @@ -42,6 +42,7 @@ class ScrollTouchGestures( private var flingY = 0f private var flingAt = 0L private var flinging = false + var clicks = true private val longPress = Runnable { held = true @@ -86,7 +87,7 @@ class ScrollTouchGestures( lastY = startY tracker = VelocityTracker.obtain().also { it.addMovement(event) } listener.onMove(startX, startY) - handler.postDelayed(longPress, TouchTiming.HOLD_MS) + if (clicks) handler.postDelayed(longPress, TouchTiming.HOLD_MS) } MotionEvent.ACTION_MOVE -> { val index = event.findPointerIndex(pointerId).takeIf { it >= 0 } ?: return true @@ -153,6 +154,7 @@ class ScrollTouchGestures( private fun click(button: Int) { releaseClick() + if (!clicks) return listener.onButton(button, true) clicked = button handler.postDelayed(clickUp, TouchTiming.CLICK_MS) diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt index ed4e87732b..659b99c0ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -17,6 +17,11 @@ class TouchpadGestures( var bounds: android.graphics.RectF = android.graphics.RectF(0f, 0f, 1f, 1f) var sensitivity = 1.15f var desktop = false + var clicks = true + set(value) { + if (field != value) lastTapAt = 0L + field = value + } private val handler = Handler(Looper.getMainLooper()) private var lastX = 0f @@ -50,12 +55,17 @@ class TouchpadGestures( held = true dragging = true listener.onLongPress() - listener.onButton(PointerGestures.BTN_LEFT, true, x, y) + press(PointerGestures.BTN_LEFT) } private val clickUp = Runnable { releaseClick() } + private fun press(button: Int) { + if (clicks) listener.onButton(button, true, x, y) + } + private fun click(button: Int) { releaseClick() + if (!clicks) return listener.onButton(button, true, x, y) clicked = button handler.postDelayed(clickUp, TouchTiming.CLICK_MS) @@ -108,12 +118,12 @@ class TouchpadGestures( travelled = 0f; held = false; twoFingers = false; scrolled = false; secondWasTap = false fingers = 1; pinching = false anchorId = event.getPointerId(0); moverId = -1; holdDrag = false; scrollLocked = false - if (event.eventTime - lastTapAt < TouchTiming.DOUBLE_TAP_MS) { + if (clicks && event.eventTime - lastTapAt < TouchTiming.DOUBLE_TAP_MS) { dragging = true - listener.onButton(PointerGestures.BTN_LEFT, true, x, y) + press(PointerGestures.BTN_LEFT) } else { dragging = false - handler.postDelayed(longPress, TouchTiming.HOLD_MS) + if (clicks) handler.postDelayed(longPress, TouchTiming.HOLD_MS) } return true } @@ -153,7 +163,7 @@ class TouchpadGestures( secondWasTap = false if (!dragging) { dragging = true - listener.onButton(PointerGestures.BTN_LEFT, true, x, y) + press(PointerGestures.BTN_LEFT) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt index f121a9a73a..0058224c01 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt @@ -48,7 +48,7 @@ class InputSurfaceView( context: Context, private val pad: PadBridge? = null, private var customLayout: List = emptyList(), - private val inputRole: InputRole = InputRole.SECONDARY, + val inputRole: InputRole = InputRole.SECONDARY, private var surfaceStyle: InputSurfaceStyle = InputSurfaceStyle(), private val haptics: Boolean = inputRole != InputRole.PRIMARY, ) : FrameLayout(context) { @@ -59,6 +59,7 @@ class InputSurfaceView( private var requestedLayout = customLayout init { customLayout = surfaceStyle.shown(customLayout); addView(content, LayoutParams(-1, -1)); renderCustom(pad) } + val shownElements: List get() = customLayout var onTouchMiss: ((MotionEvent) -> Unit)? = null private var forwardedPointers = 0 diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index 578c936ad6..62f3c61f6c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -63,7 +63,8 @@ class SecondScreenPresentation( private var imeSeen = false private var fieldKeyboard = false private var terminalPanel: SessionTerminalPanel? = null - private var controlsView: InputSurfaceView? = null + var controlsView: InputSurfaceView? = null + private set private var created = false init { diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt index 4bfa52f518..9c81655b0a 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt @@ -592,4 +592,45 @@ class InputLibraryTest { assertEquals(old.preset(InputStockLayouts.TRACKPAD), upgraded.preset(InputStockLayouts.TRACKPAD)) assertEquals(InputStockLayouts.layouts().single { it.id == InputLibraries.DECK }.elements, upgraded.layouts.single { it.id == InputLibraries.DECK }.elements) } + + @Test fun stockSecondScreenPanelsKeepTapsClicking() { + val library = InputLibraries.read(context) + for (desktop in listOf(false, true)) for (panel in listOf(null, InputStockLayouts.TRACKPAD) + DeckPanel.entries.map { it.bindings }) { + val shown = library.panelLayout(desktop, panel)!!.elements + assertTrue(shown.isNotEmpty()) + assertFalse(library.compileActive(desktop, panel).showsMouseButton(InputRole.SECONDARY, shown, library.compileStock(desktop, panel))) + } + } + + @Test fun userBoundSecondScreenMouseButtonIsDetected() { + val stock = InputLibraries.read(context) + val grips = DeckPanel.GRIPS.bindings + val button = stock.panelLayout(false, grips)!!.elements.first { it.control.dimensions == 1 } + val bound = stock.withPreset(stock.preset(grips).copy(elements = mapOf(button.id to InputAction.MouseButton(272)))) + for (desktop in listOf(false, true)) { + assertTrue(bound.compileActive(desktop, grips).showsMouseButton(InputRole.SECONDARY, listOf(button), bound.compileStock(desktop, grips))) + assertFalse(bound.compileActive(desktop, grips).showsMouseButton(InputRole.PRIMARY, listOf(button), bound.compileStock(desktop, grips))) + } + val pad = stock.panelLayout(true, InputStockLayouts.TRACKPAD)!!.elements.single() + val rebound = stock.withPreset(stock.preset(InputStockLayouts.TRACKPAD).let { it.copy(clicks = it.clicks + (pad.id to InputAction.MouseButton(273))) }) + assertTrue(rebound.compileActive(true).showsMouseButton(InputRole.SECONDARY, listOf(pad), rebound.compileStock(true))) + } + + @Test fun copiedStockPanelsKeepTapsClickingUntilAMouseButtonIsAdded() { + val stock = InputLibraries.read(context) + for (desktop in listOf(false, true)) { + val source = stock.panelLayout(desktop, null)!! + val copied = stock.useLayout(stock.activeId(desktop), InputRole.SECONDARY, source.id, shared = false) + val layout = copied.activeLayout(desktop, InputRole.SECONDARY)!! + assertNotEquals(source.id, layout.id) + assertEquals(source.id, layout.origin) + assertFalse(copied.compileActive(desktop).showsMouseButton(InputRole.SECONDARY, layout.elements, copied.compileStock(desktop))) + val added = InputSurfaceElement(InputControl.A, .4f, .4f, .1f, .1f, id = "custom:added") + val grown = copied.withLayout(layout.copy(elements = layout.elements + added)) + val bindings = grown.activePart(desktop, InputRole.SECONDARY).bindings + val bound = grown.withPreset(grown.preset(bindings).let { it.copy(elements = it.elements + (added.id to InputAction.MouseButton(272))) }) + assertTrue(bound.compileActive(desktop).showsMouseButton(InputRole.SECONDARY, layout.elements + added, bound.compileStock(desktop))) + assertFalse(bound.compileActive(desktop).showsMouseButton(InputRole.SECONDARY, layout.elements, bound.compileStock(desktop))) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenMouseButtonTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenMouseButtonTest.kt new file mode 100644 index 0000000000..aebe881c8a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenMouseButtonTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.input + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class OnScreenMouseButtonTest { + private val button = InputSurfaceElement(InputControl.A, .8f, .6f, .1f, .1f, id = "custom:left") + private val stick = InputSurfaceElement(InputControl.LS, .1f, .6f, .2f, .3f, id = "custom:stick") + private val legacyA = InputSurfaceElement(InputControl.A, .8f, .6f, .1f, .1f) + private val game = InputProfile.defaults(InputProfile.GAME) + private val desktop = InputProfile.defaults(InputProfile.DESKTOP) + private val overlay = InputControl.entries.map { InputSurfaceElement(it, .1f, .1f, .1f, .1f) } + + private fun profile(vararg elements: Pair, clicks: Map = emptyMap(), base: InputProfile = game) = + base.copy(elements = mapOf(InputRole.PRIMARY to elements.toMap()), clicks = mapOf(InputRole.PRIMARY to clicks)) + + @Test fun shownButtonBoundToAMouseButtonIsDetected() { + listOf(272, 273, 274).forEach { code -> + assertTrue(profile(button.id to InputAction.MouseButton(code)).showsMouseButton(InputRole.PRIMARY, listOf(stick, button), game)) + } + } + + @Test fun stickClickBoundToAMouseButtonIsDetected() { + val profile = profile(stick.id to InputAction.Native(), clicks = mapOf(stick.id to InputAction.MouseButton(272))) + assertTrue(profile.showsMouseButton(InputRole.PRIMARY, listOf(stick), game)) + } + + @Test fun legacyButtonUsesItsRoleBinding() { + val profile = game.withBinding(InputRole.PRIMARY, InputControl.A, InputAction.MouseButton(272)) + assertTrue(profile.showsMouseButton(InputRole.PRIMARY, listOf(legacyA), game)) + assertFalse(profile.showsMouseButton(InputRole.SECONDARY, listOf(legacyA), game)) + } + + @Test fun stockDesktopOverlayKeepsTapsClicking() { + assertFalse(desktop.showsMouseButton(InputRole.PRIMARY, overlay, desktop)) + } + + @Test fun userBoundMouseButtonInDesktopIsDetected() { + val rebound = desktop.withBinding(InputRole.PRIMARY, InputControl.X, InputAction.MouseButton(272)) + assertTrue(rebound.showsMouseButton(InputRole.PRIMARY, overlay, desktop)) + val stickClick = desktop.withBinding(InputRole.PRIMARY, InputControl.L3, InputAction.MouseButton(274)) + assertTrue(stickClick.showsMouseButton(InputRole.PRIMARY, overlay, desktop)) + assertTrue(profile(button.id to InputAction.MouseButton(272), base = desktop).showsMouseButton(InputRole.PRIMARY, overlay + button, desktop)) + } + + @Test fun desktopBindingsOnAGameBaseProfileAreUserPicked() { + val copied = desktop.copy(id = "custom") + assertTrue(copied.showsMouseButton(InputRole.PRIMARY, overlay, game)) + } + + @Test fun layoutWithoutAMouseButtonKeepsTapsClicking() { + val profile = profile(button.id to InputAction.Keys(listOf(57)), stick.id to InputAction.Pointer()) + assertFalse(profile.showsMouseButton(InputRole.PRIMARY, listOf(stick, button), game)) + assertFalse(game.showsMouseButton(InputRole.PRIMARY, listOf(legacyA, stick) + overlay, game)) + } + + @Test fun hiddenMouseButtonDoesNotCount() { + assertFalse(profile(button.id to InputAction.MouseButton(272)).showsMouseButton(InputRole.PRIMARY, listOf(stick), game)) + assertFalse(profile(button.id to InputAction.MouseButton(272)).showsMouseButton(InputRole.PRIMARY, emptyList(), game)) + } + + @Test fun physicalMouseBindingsDoNotCount() { + val profile = game.withBinding(InputRole.PHYSICAL, InputControl.A, InputAction.MouseButton(272)) + assertFalse(profile.showsMouseButton(InputRole.PRIMARY, listOf(legacyA), game)) + } + + @Test fun invalidMouseCodeDoesNotCount() { + assertFalse(profile(button.id to InputAction.MouseButton(1)).showsMouseButton(InputRole.PRIMARY, listOf(button), game)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt index 60436eaabd..ea2d50c5fb 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt @@ -131,6 +131,50 @@ class ScrollTouchGesturesTest { assertEquals(listOf("move 400,300"), events) } + @Test fun tapsAndHoldsDoNotClickWhileClicksAreOff() { + gestures.clicks = false + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + advance(100) + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(600) + touch(MotionEvent.ACTION_UP, 402f, 301f) + advance(100) + assertEquals(listOf("move 400,300", "move 400,300"), events) + } + + @Test fun holdThenMoveScrollsWhileClicksAreOff() { + gestures.clicks = false + touch(MotionEvent.ACTION_DOWN, 400f, 800f) + advance(600) + touch(MotionEvent.ACTION_MOVE, 402f, 500f) + advance(200) + touch(MotionEvent.ACTION_UP, 402f, 500f) + advance(100) + assertEquals(300f, scrolledY, 0.01f) + assertEquals(listOf("move 400,800"), events) + } + + @Test fun turningClicksOffReleasesAClickInFlight() { + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + gestures.clicks = false + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + advance(100) + assertEquals(listOf("move 400,300", "left down", "left up", "move 400,300"), events) + events.clear() + gestures.clicks = true + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + advance(100) + assertEquals(listOf("move 400,300", "left down", "left up"), events) + } + @Test fun aSecondFingerDoesNotJumpTheScroll() { touch(MotionEvent.ACTION_DOWN, 400f, 900f) advance(100) diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt index 2b84e3ae4d..c967ce02fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -262,6 +262,75 @@ class TouchpadGesturesTest { assertFalse(events.contains("left down")) } + @Test fun tapsDoNotClickWhileClicksAreOff() { + touchpad.clicks = false + tap() + advance(20) + tap() + advance(TouchTiming.HOLD_MS + 100) + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(TouchTiming.HOLD_MS + 100) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(200) + assertFalse(events.any { it.endsWith(" down") }) + } + + @Test fun twoFingerTapDoesNotClickWhileClicksAreOff() { + touchpad.clicks = false + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + advance(60) + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + advance(10) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(200) + assertFalse(events.any { it.endsWith(" down") }) + } + + @Test fun pointerStillMovesWhileClicksAreOff() { + touchpad.clicks = false + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_MOVE, 0, 1 to (440f to 300f)) + advance(10) + touch(MotionEvent.ACTION_UP, 0, 1 to (440f to 300f)) + assertTrue(events.contains("move")) + assertTrue(touchpad.x > 960f) + assertFalse(events.any { it.endsWith(" down") }) + } + + @Test fun tapsClickAgainOnceClicksAreBackOn() { + touchpad.clicks = false + tap() + advance(400) + touchpad.clicks = true + tap() + advance(200) + assertEquals(listOf("left down", "left up"), events) + } + + @Test fun aTapWhileClicksWereOffDoesNotStartADragOnceTheyAreBackOn() { + touchpad.clicks = false + tap() + advance(20) + touchpad.clicks = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + assertEquals(emptyList(), events) + advance(80) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(200) + assertEquals(listOf("left down", "left up"), events) + } + + @Test fun doubleTapStillDragsWhileClicksStayOn() { + tap() + advance(20) + touchpad.clicks = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + assertEquals(listOf("left down", "left up", "left down"), events) + } + private fun tap() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(80)