diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 09f66bdc35..89dbba58b5 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -655,6 +655,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } hud = FusionHudHost(this) hud.onConfigChanged = { hudConfig = FusionHudConfig.load(this) } + hud.passesTouchAt = ::controlTakesTouchAt hud.attach(root, root.childCount) memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { @@ -2439,6 +2440,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchTrackballEvent(event: MotionEvent): Boolean = onCapturedPointer(event) || super.dispatchTrackballEvent(event) + /** Whether one of the on-screen control layers takes a finger going down at this screen point. */ + private fun controlTakesTouchAt(rawX: Float, rawY: Float): Boolean { + val at = IntArray(2) + fun takes(view: View, hit: (Float, Float) -> Boolean): Boolean { + if (!view.isShown) return false + view.getLocationOnScreen(at) + val x = rawX - at[0] + val y = rawY - at[1] + return x >= 0f && y >= 0f && x < view.width && y < view.height && hit(x, y) + } + return onScreenControls?.let { takes(it, it::takesTouchAt) } == true || + steamTouchControls?.let { takes(it, it::takesTouchAt) } == true || + screenKeys?.let { takes(it, it::takesTouchAt) } == true || + unfoldedPanel?.let { takes(it, it::takesTouchAt) } == true + } + override fun dispatchTouchEvent(event: MotionEvent): Boolean { if (pipUi) return true if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt index 4ba8333bdb..ca95538a6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt @@ -5,9 +5,12 @@ import com.droiddeck.launcher.session.SessionPrefs /** FusionHUD's settings as one "key=value,…" string (FusionHudView.applyConfig), stored in SessionPrefs. */ internal object FusionHudConfig { - /** Bannerlator's Fusion defaults (DeckOverlaySettings), with the FPS graph from the old DroidDeck HUD. */ + /** + * Bannerlator's Fusion defaults (DeckOverlaySettings), with the FPS graph from the old DroidDeck HUD. The HUD starts + * locked, so like the old HUD it lets touches through until it is unlocked to move it. + */ val DEFAULTS: Map = linkedMapOf( - "hudSize" to "minimal", "hudLocked" to "0", "hudScale" to "100", "hudOpacity" to "80", "hudColor" to "mid", + "hudSize" to "minimal", "hudLocked" to "1", "hudScale" to "100", "hudOpacity" to "80", "hudColor" to "mid", "hudOutline" to "40", "hudOutlineAccent" to "1", "showFPS" to "1", "showFPSGraph" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showGPULoad" to "1", "showVram" to "1", "showRAM" to "1", "showPower" to "1", "showTemp" to "1", "showBatteryTemp" to "1", diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt index 69c0c3526f..3e3b5db638 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt @@ -44,6 +44,9 @@ class FusionHudHost(context: Context) { /** The HUD itself changed a setting: a tap cycles the size, a long press locks it. */ var onConfigChanged: (() -> Unit)? = null + /** Screen point → whether an on-screen control takes a touch there; a locked HUD lets those through. */ + var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null + private val listener = object : WaylandCompositor.GameListener { override fun onGameSurface(window: String?, gpuName: String?) { if (!gpuName.isNullOrBlank()) handler.post { this@FusionHudHost.gpuName = cleanGpuName(gpuName) } @@ -90,6 +93,7 @@ class FusionHudHost(context: Context) { onConfigChanged?.invoke() } hud.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> if (!hud.isDragging) keepOnScreen(hud) } + hud.passesTouchAt = { x, y -> passesTouchAt?.invoke(x, y) == true } hud.visibility = View.GONE val margin = (16 * root.resources.displayMetrics.density).roundToInt() root.addView(hud, index, FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt index 95d0581132..2fadde009b 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt @@ -57,7 +57,8 @@ import kotlinx.coroutines.withTimeoutOrNull * * Gestures go through [HudLockController]: long-press toggles the position lock (with a lock/unlock * badge fade), a tap cycles the size (Full→Tiles→Pill→Minimal→Full), and a drag repositions — tap + - * drag are frozen while locked. + * drag are frozen while locked. A locked HUD lets a touch through where an on-screen control under it + * takes it ([passesTouchAt]); everywhere else it keeps the touch, so a long press there unlocks it. */ class FusionHudView(context: Context) : View(context) { @@ -294,7 +295,7 @@ class FusionHudView(context: Context) : View(context) { showDxVer = cfg.get("showDxVer", "1") == "1" showSession = cfg.get("showSession", "1") == "1" tempDisplay = HudMetrics.TempDisplay.from(cfg) - lockController.setLocked(cfg.get("hudLocked", "0") == "1") + lockController.setLocked(cfg.get("hudLocked", "1") == "1") colorIntensity = when (cfg.get("hudColor", "vivid")) { "soft" -> 0.72f; "mid" -> 0.88f; else -> 1.0f @@ -865,25 +866,20 @@ class FusionHudView(context: Context) : View(context) { } // RAM % (system-wide) takes the slot the latency row used to occupy, matching the GPU/CPU idiom // on the row above it. colRam keeps RAM's identity colour consistent with the Full/Tiles sizes. - if (showRAM) { + if (showRAM) stack.add(listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, stkPx))) + // One battery row, as on the other sizes: each part shows on its own switch, so the battery + // temperature no longer goes with the RAM switch and watts show without the battery level. + if (showBattery || showPower || showBatteryTemp) { val l = ArrayList() - l += Span("RAM ${s.ramPercent.roundToInt()}%", colRam, stkPx) - // Battery temperature as a "BAT" chip right after RAM (pill-only placement, per user - // request). Colour-banded warm→red via tempSpans/TempSensor.BATTERY — the exact same - // danger bands the GPU/CPU temps use. Only shown when the battery-temp toggle is on - // and a reading is available; the other sizes keep battery temp in the battery row. - if (showBatteryTemp && s.battery.tempC != null) { - l += Span(" · ", colDim, stkPx) - l += Span("BAT ", colBat, stkPx) - l += tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, stkPx, stkPx * 0.62f) + fun part(spans: List) { + l += if (l.isEmpty()) Span("BAT ", colBat, stkPx) else Span(" · ", colDim, stkPx) + l += spans } - stack.add(l) - } - if (showBattery || showPower) { - val l = ArrayList(); var any = false - if (showBattery && s.battery.percent != null) { l += Span("BAT ${s.battery.percent}%", colBat, stkPx); any = true } - if (showPower && s.battery.watts > 0f) { if (any) l += Span(" · ", colDim, stkPx); l += Span("${fmt1(s.battery.watts)}W", colDim, stkPx) } - if (any) stack.add(l) + if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, stkPx))) + if (showBatteryTemp && s.battery.tempC != null) + part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, stkPx, stkPx * 0.62f)) + if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, stkPx))) + if (l.isNotEmpty()) stack.add(l) } // Latency (+ the display server, + optional VRAM) drops to the bottom of the stack, under the // battery row. The display server sits here, not on the GPU-model line: that line is the @@ -1340,6 +1336,8 @@ class FusionHudView(context: Context) : View(context) { @VisibleForTesting internal fun panelForTest(): RectF? = dPanel @VisibleForTesting internal fun panelRadiusForTest(): Float = dRadius @VisibleForTesting internal fun graphForTest(): RectF? = graphRect + @VisibleForTesting internal fun linesForTest(): List = + glyphs.groupBy { it.baseline.roundToInt() }.toSortedMap().values.map { line -> line.sortedBy { it.x }.joinToString("") { it.text } } private fun drawChip(canvas: Canvas, rect: RectF) { val r = sp(6f) @@ -1355,7 +1353,15 @@ class FusionHudView(context: Context) : View(context) { DroidDeckMark.draw(canvas, rect.centerX() - markW / 2f, rect.centerY() - markH / 2f, markH, blend(colValue), accent) } - override fun onTouchEvent(event: MotionEvent): Boolean = lockController.onTouchEvent(event) + /** Screen point → whether an on-screen control under the HUD takes a touch there. */ + internal var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null + + // Declining the down event hands the whole gesture to the views under the HUD. + override fun onTouchEvent(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN && lockController.isLocked() && + passesTouchAt?.invoke(event.rawX, event.rawY) == true) return false + return lockController.onTouchEvent(event) + } internal val isDragging: Boolean get() = lockController.isDragging() diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java index c5d75b4e5f..3266e85fee 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -39,7 +39,7 @@ import java.util.function.Consumer; * position — disabled (frozen) while locked. *
  • long-press → toggles {@code hudLocked}, persisted via {@link Callbacks#onLockChanged} * and kept in sync with the "Lock in place" menu chip. Works locked or unlocked (so a long-press - * always unlocks).
  • + * always unlocks); a locked {@code FusionHudView} passes touches on only over on-screen controls. * * *

    On every lock/unlock (and on a blocked gesture while locked) a small padlock badge fades in → 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 e0a0b14b9b..b7fced7106 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -672,6 +672,11 @@ class OnScreenControls( private fun closestSnap(position: Float, targets: List): Float? = targets.minByOrNull { abs(position - it) }?.takeIf { abs(position - it) <= dp(SNAP_DP) } + /** Whether a finger going down at ([x], [y]) lands on something here, as [onTouchEvent] decides it. */ + fun takesTouchAt(x: Float, y: Float): Boolean = + editing || keyboardContains(x, y) || (!buttonsOnly && quickContains(x, y)) || + (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null) + private fun controlAt(x: Float, y: Float): Control? = controls.firstOrNull { !quickHidden && isVisible(it) && (editing || !settings.adaptiveSticks || it.stick < 0) && it.contains(x, y, it.radius) diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt index c7a9291e9e..df129888c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt @@ -609,6 +609,9 @@ class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) else -> entry.halfH } + /** Whether a finger going down at ([x], [y]) lands on something here, as [onTouchEvent] decides it. */ + fun takesTouchAt(x: Float, y: Float): Boolean = editing || entryAt(x, y) != null + private fun entryAt(x: Float, y: Float): Entry? = entries.lastOrNull { entry -> x >= entry.cx - entry.halfW && x <= entry.cx + entry.halfW && y >= entry.cy - entry.halfH && y <= entry.cy + entry.halfH } diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 2138f9c92b..68eed5edea 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -244,6 +244,9 @@ class SteamTouchControls( private fun hit(list: List, x: Float, y: Float): Element? = list.filter { reach(it, x, y) <= 1.15f }.minByOrNull { reach(it, x, y) } + /** Whether a finger going down at ([x], [y]) lands on something here, as [onTouchEvent] decides it. */ + fun takesTouchAt(x: Float, y: Float): Boolean = editing || menuOpen || hit(live(), x, y) != null + private fun live(): List = if (shakenAway) emptyList() else if (options.inputMode == SteamTouchConfig.INPUT_MOUSE) elements.filter { it.type == SteamTouchConfig.THUMB } else elements diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt index a85557bfda..1afa23b71a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -254,6 +254,21 @@ class DeckControlsPanel( show() } + /** Whether a finger going down at ([x], [y]) lands on one of the panel's controls. */ + fun takesTouchAt(x: Float, y: Float): Boolean = controlUnder(this, x, y) + + // Every control here takes the touches it gets: buttons and tabs (clickable), the scrolling tab strip, + // and the drawn surfaces, pads and face buttons. The layouts around them do not. + private fun controlUnder(view: View, x: Float, y: Float): Boolean { + if (view.visibility != VISIBLE || x < 0f || y < 0f || x >= view.width || y >= view.height) return false + if (view.isClickable || view is HorizontalScrollView || view is Surface || view is DirectionPad || view is FaceButtons) return true + val group = view as? ViewGroup ?: return false + return (group.childCount - 1 downTo 0).any { i -> + val child = group.getChildAt(i) + controlUnder(child, x + group.scrollX - child.x, y + group.scrollY - child.y) + } + } + private fun roundButton(label: String, description: String, onClick: () -> Unit, wide: Boolean = false) = roundButton(context, label, description, onClick, wide) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 879cf590ca..9317b37934 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -624,7 +624,7 @@ مصغّر ضخم تثبيت في مكانه - اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. + اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل. المظهر الحجم على الشاشة هادئ diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index d9dc092284..49774c13b5 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -611,7 +611,7 @@ Mínimo Mega Fijar posición - Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. + Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. Aspecto Tamaño en pantalla Suave diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index b89165c4a6..af647544da 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -616,7 +616,7 @@ Минимален Мега Заключване на място - Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. + Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. Докато е заключен, екранните контроли под него продължават да работят. Визия Размер на екрана Мек diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index fc68fb2df3..0e60fbeb76 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -620,7 +620,7 @@ Minimální Mega Zamknout na místě - Přetažením HUD přesunete; dlouhým stiskem ho zamknete nebo odemknete. + Přetažením HUD přesunete; dlouhým stiskem ho zamknete nebo odemknete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují. Vzhled Velikost na obrazovce Jemná diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 163ce604a9..67b4f3f656 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -616,7 +616,7 @@ Minimal Mega Lås fast - Træk i HUD for at flytte det; et langt tryk låser eller frigør det. + Træk i HUD for at flytte det; et langt tryk låser eller frigør det. Mens det er låst, virker skærmknapperne under det stadig. Udseende Størrelse på skærmen Blød diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 16bc2b3fac..dab0115eac 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -616,7 +616,7 @@ Minimal Mega Position sperren - Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. + Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter. Aussehen Größe auf dem Bildschirm Dezent diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 75060f10b8..293248af54 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -616,7 +616,7 @@ Ελάχιστο Μέγα Κλείδωμα θέσης - Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. + Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν. Εμφάνιση Μέγεθος στην οθόνη Απαλό diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4acdb9ee6c..786d8a8490 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -620,7 +620,7 @@ Mínimo Mega Fijar posición - Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. + Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. Aspecto Tamaño en pantalla Suave diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 895e5d6939..f51b200d8b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -616,7 +616,7 @@ Minimaalinen Mega Lukitse paikalleen - Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. + Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen. Ulkoasu Koko näytöllä Pehmeä diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 568854da10..b039d1f32a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -620,7 +620,7 @@ Minimal Méga Verrouiller la position - Faites glisser le HUD pour le déplacer ; un appui long le verrouille ou le déverrouille. + Faites glisser le HUD pour le déplacer ; un appui long le verrouille ou le déverrouille. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables. Apparence Taille à l\'écran Douce diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1b34d97990..9b349768ad 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -616,7 +616,7 @@ मिनिमल मेगा जगह पर लॉक करें - HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। + HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं। लुक स्क्रीन पर आकार हल्का diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c5cbf30cf0..b173fd19c6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -616,7 +616,7 @@ Minimális Mega Rögzítés a helyén - Húzd a HUD-ot az áthelyezéshez; hosszú nyomással rögzítheted vagy feloldhatod. + Húzd a HUD-ot az áthelyezéshez; hosszú nyomással rögzítheted vagy feloldhatod. Rögzítve is működnek az alatta lévő képernyős vezérlők. Megjelenés Méret a képernyőn Lágy diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index c12802ba85..f403919e1e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -614,7 +614,7 @@ Minimal Mega Kunci posisi - Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. + Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi. Tampilan Ukuran di layar Lembut diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d5f2fb33b4..82c7900203 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -618,7 +618,7 @@ Minimo Mega Blocca in posizione - Trascina l\'HUD per spostarlo; una pressione prolungata lo blocca o lo sblocca. + Trascina l\'HUD per spostarlo; una pressione prolungata lo blocca o lo sblocca. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare. Aspetto Dimensione sullo schermo Tenue diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bc0e3249d8..a9f626ed2f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -616,7 +616,7 @@ ミニマル メガ 位置を固定 - HUDはドラッグで移動できます。長押しで固定または解除します。 + HUDはドラッグで移動できます。長押しで固定または解除します。固定中も、下にある画面上のコントロールは使えます。 外観 画面上のサイズ ソフト diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c530028814..a1d53bb1d6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -616,7 +616,7 @@ 미니멀 메가 위치 고정 - HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. + HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다. 외관 화면상 크기 은은함 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 1e03d36fdb..54f9d2bf89 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -614,7 +614,7 @@ Minimal Mega Kunci di tempat - Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. + Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi. Rupa Saiz pada skrin Lembut diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b427b86006..da7aaae341 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -616,7 +616,7 @@ Minimal Mega Lås på plass - Dra HUD-en for å flytte den; et langt trykk låser eller låser den opp. + Dra HUD-en for å flytte den; et langt trykk låser eller låser den opp. Mens den er låst, fungerer skjermkontrollene under den fortsatt. Utseende Størrelse på skjermen Myk diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d801ec7c76..3f0c48f330 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -616,7 +616,7 @@ Minimaal Mega Vastzetten - Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. + Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. Zolang hij vastzit, blijven de schermknoppen eronder werken. Weergave Grootte op scherm Zacht diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 485f0163bf..6949a8506e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -620,7 +620,7 @@ Minimalny Mega Zablokuj w miejscu - Przeciągnij HUD, aby go przesunąć; długie naciśnięcie blokuje go lub odblokowuje. + Przeciągnij HUD, aby go przesunąć; długie naciśnięcie blokuje go lub odblokowuje. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa. Wygląd Rozmiar na ekranie Stonowany diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ba205541ab..b50107f660 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -618,7 +618,7 @@ Mínimo Mega Bloquear posição - Arraste o HUD para o mover; um toque longo bloqueia-o ou desbloqueia-o. + Arraste o HUD para o mover; um toque longo bloqueia-o ou desbloqueia-o. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar. Aspeto Tamanho no ecrã Suave diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9908b1548d..2a39f9d91d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -618,7 +618,7 @@ Mínimo Mega Travar posição - Arraste o HUD para movê-lo; um toque longo o trava ou destrava. + Arraste o HUD para movê-lo; um toque longo o trava ou destrava. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando. Aparência Tamanho na tela Suave diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 207eb9c767..0731ecf801 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -618,7 +618,7 @@ Minimal Mega Blochează pe loc - Trage HUD-ul pentru a-l muta; o apăsare lungă îl blochează sau îl deblochează. + Trage HUD-ul pentru a-l muta; o apăsare lungă îl blochează sau îl deblochează. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare. Aspect Dimensiune pe ecran Discretă diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index eea45ec77f..7e108ca4ef 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -622,7 +622,7 @@ Минимальный Мега Закрепить на месте - Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. + Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. Пока он закреплён, экранные элементы управления под ним продолжают работать. Внешний вид Размер на экране Мягкий diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5e88f8c8fd..00827a7325 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -616,7 +616,7 @@ Minimal Mega Lås på plats - Dra HUD:en för att flytta den; ett långt tryck låser eller låser upp den. + Dra HUD:en för att flytta den; ett långt tryck låser eller låser upp den. När den är låst fungerar skärmkontrollerna under den fortfarande. Utseende Storlek på skärmen Mjuk diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 7a8e65a251..01c0be6464 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -614,7 +614,7 @@ มินิมอล เมกะ ล็อกตำแหน่ง - ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก + ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้ รูปลักษณ์ ขนาดบนหน้าจอ อ่อน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index afc361fab9..39ba9c2edf 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -616,7 +616,7 @@ Minimal Mega Yerinde kilitle - Taşımak için HUD\'u sürükleyin; uzun basmak onu kilitler veya kilidini açar. + Taşımak için HUD\'u sürükleyin; uzun basmak onu kilitler veya kilidini açar. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder. Görünüm Ekrandaki boyut Yumuşak diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 9b76b6fe57..e519812be9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -620,7 +620,7 @@ Мінімальний Мега Закріпити на місці - Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. + Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. Поки його закріплено, екранні елементи керування під ним працюють і далі. Вигляд Розмір на екрані М\'який diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 552b27d498..efc25f5a4d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -614,7 +614,7 @@ Tối giản Mega Khóa vị trí - Kéo HUD để di chuyển; nhấn giữ để khóa hoặc mở khóa. + Kéo HUD để di chuyển; nhấn giữ để khóa hoặc mở khóa. Khi đã khóa, các nút điều khiển trên màn hình bên dưới vẫn hoạt động. Giao diện Kích thước trên màn hình Dịu diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1731a3cf00..9dcbd81340 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -616,7 +616,7 @@ 极简 超大 锁定位置 - 拖动 HUD 可移动位置;长按可锁定或解锁。 + 拖动 HUD 可移动位置;长按可锁定或解锁。锁定时,下方的屏幕控件仍可使用。 外观 屏幕显示大小 柔和 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 33063e5979..28f2d92f0c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -616,7 +616,7 @@ 極簡 超大 鎖定位置 - 拖曳 HUD 可移動位置;長按可鎖定或解鎖。 + 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 外觀 螢幕顯示大小 柔和 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 674d445eb6..b9e95e8190 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -616,7 +616,7 @@ 極簡 超大 鎖定位置 - 拖曳 HUD 可移動位置;長按可鎖定或解鎖。 + 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 外觀 螢幕顯示大小 柔和 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db86a0309d..ef6481a465 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -675,7 +675,7 @@ Minimal Mega Lock in place - Drag the HUD to move it; a long press locks or unlocks it. + Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work. Look Size on screen Soft diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt index f27a77cfe6..47c33a1f62 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt @@ -3,16 +3,24 @@ package com.droiddeck.launcher.hud import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Color +import android.os.Looper +import android.os.SystemClock +import android.view.MotionEvent import android.view.View +import android.view.ViewConfiguration +import android.widget.FrameLayout import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode import java.io.ByteArrayOutputStream +import java.time.Duration import java.util.Base64 import kotlin.math.roundToInt import kotlin.math.sqrt @@ -25,6 +33,10 @@ class FusionHudPanelTest { assertEquals(FusionSize.MINIMAL, FusionSize.from(FusionHudConfig.DEFAULTS["hudSize"])) } + @Test fun theHudStartsLocked() { + assertEquals("1", FusionHudConfig.DEFAULTS["hudLocked"]) + } + @Test fun everySizeDrawsTheDPanelWithEverythingInsideIt() { val stats = FrameStats() var now = 1_000_000_000L @@ -33,11 +45,7 @@ class FusionHudPanelTest { now += frametime stats.add(frametime, now) } - val snapshot = HudMetrics.Snapshot(64, 52, 3302, 1050, 89, 79, 10_800_000_000L, 16_000_000_000L, 67f, - 1_800_000_000L, HudMetrics.Battery(16f, false, 79, 34, null), - intArrayOf(91, 91, 48, 50, 48, 19, 17, 73), intArrayOf(2265, 2265, 3148, 3148, 3148, 2956, 2956, 3302), - 2_700_000_000L, 6_400_000_000L, 31_000L, 9_000L) - + val snapshot = SNAPSHOT for (size in FusionSize.values()) { val view = FusionHudView(RuntimeEnvironment.getApplication()) view.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudSize" to size.token))) @@ -65,4 +73,76 @@ class FusionHudPanelTest { assertTrue("$size orb on the left side", Color.blue(orb) > 200 && Color.alpha(orb) > 200) } } + + @Test fun pillShowsEachBatteryPartOnItsOwnSwitch() { + fun pill(vararg settings: Pair): List { + val view = FusionHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudSize" to FusionSize.PILL.token) + settings)) + view.showForTest(SNAPSHOT, "DXVK", 0L) + return view.linesForTest() + } + val all = pill("showBattery" to "1") + assertTrue(all.toString(), all.any { "BAT 79% · 34°C · 16.0W" in it }) + assertEquals(all.toString(), 1, all.count { "BAT" in it }) + assertFalse(all.toString(), all.single { "RAM" in it }.contains("BAT")) + + val noMemory = pill("showBattery" to "1", "showRAM" to "0") + assertTrue(noMemory.toString(), noMemory.none { "RAM" in it }) + assertTrue(noMemory.toString(), noMemory.any { "BAT 79% · 34°C · 16.0W" in it }) + + val defaults = pill() + assertTrue(defaults.toString(), defaults.any { "BAT 34°C · 16.0W" in it }) + val wattsOnly = pill("showBatteryTemp" to "0") + assertTrue(wattsOnly.toString(), wattsOnly.any { "BAT 16.0W" in it }) + val nothing = pill("showBatteryTemp" to "0", "showPower" to "0") + assertTrue(nothing.toString(), nothing.none { "BAT" in it }) + } + + @Test fun aLockedHudLetsTouchesThroughOnlyWhereAControlTakesThem() { + val app = RuntimeEnvironment.getApplication() + var reached = 0 + val under = View(app).apply { + setOnTouchListener { _, e -> if (e.actionMasked == MotionEvent.ACTION_DOWN) reached++; true } + } + val hud = FusionHudView(app) + val parent = FrameLayout(app) + parent.addView(under, FrameLayout.LayoutParams(2000, 2000)) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + var control = false + hud.passesTouchAt = { _, _ -> control } + val locks = ArrayList() + hud.setOnLockChangedListener { locks += it } + hud.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudLocked" to "0"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + assertTrue(hud.width > 0 && hud.height > 0) + fun touch(holdMs: Long = 50L) { + val x = hud.width / 2f; val y = hud.height / 2f + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(holdMs)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + } + control = true + touch() + assertEquals("an unlocked HUD keeps the touch (tap, drag, long press)", 0, reached) + hud.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudLocked" to "1"))) + touch() + assertEquals("a locked HUD passes it to the control under it", 1, reached) + control = false + touch() + assertEquals("a locked HUD keeps a touch no control takes", 1, reached) + touch(holdMs = ViewConfiguration.getLongPressTimeout() + 300L) + assertEquals("a long press there unlocks it", listOf(false), locks) + } + + private companion object { + val SNAPSHOT = HudMetrics.Snapshot(64, 52, 3302, 1050, 89, 79, 10_800_000_000L, 16_000_000_000L, 67f, + 1_800_000_000L, HudMetrics.Battery(16f, false, 79, 34, null), + intArrayOf(91, 91, 48, 50, 48, 19, 17, 73), intArrayOf(2265, 2265, 3148, 3148, 3148, 2956, 2956, 3302), + 2_700_000_000L, 6_400_000_000L, 31_000L, 9_000L) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt index a857316e53..b1096f3f47 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -173,6 +173,17 @@ class OnScreenControlsTest { assertEquals(-1, field(control("rs"), "pressedBy")) } + @Test fun takesTouchAtMatchesWhatATouchDoes() { + var checked = 0 + for (x in 0 until 1200 step 40) for (y in 0 until 800 step 40) { + val expected = view.takesTouchAt(x.toFloat(), y.toFloat()) + assertEquals("($x, $y)", expected, touch(MotionEvent.ACTION_DOWN, 0 to (x.toFloat() to y.toFloat()))) + touch(MotionEvent.ACTION_UP, 0 to (x.toFloat() to y.toFloat())) + if (expected) checked++ + } + assertTrue("some points land on controls", checked > 0) + } + @Test fun fixedSticksAndEditorRemainVisibleAtSavedPositions() { ControllerPrefs.setAdaptiveSticks(context, false) view.reload() diff --git a/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt index 8a95dd5128..14905a5964 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt @@ -68,6 +68,22 @@ class ScreenKeysTest { assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) } + @Test fun takesTouchAtMatchesWhatATouchDoes() { + val keys = ScreenKeys(context) { _, _ -> } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_W)) + var checked = 0 + for (x in 0 until 1000 step 25) for (y in 0 until 600 step 25) { + val expected = keys.takesTouchAt(x.toFloat(), y.toFloat()) + val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, x.toFloat(), y.toFloat(), 0) + assertEquals("($x, $y)", expected, keys.onTouchEvent(down)) + down.recycle() + MotionEvent.obtain(0L, 1L, MotionEvent.ACTION_UP, x.toFloat(), y.toFloat(), 0).also { keys.onTouchEvent(it); it.recycle() } + if (expected) checked++ + } + assertTrue("some points land on the key", checked > 0) + } + @Test fun loadingLayoutReleasesLatchedKeysBeforeReplacingEntries() { val sent = mutableListOf>() val keys = ScreenKeys(context) { code, down -> sent += code to down } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt new file mode 100644 index 0000000000..4aa3a03276 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.ui + +import android.view.MotionEvent +import android.view.View +import com.droiddeck.launcher.input.JoyConPadTest +import com.droiddeck.launcher.input.PadBridge +import com.droiddeck.launcher.session.SessionState +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.nio.file.Files + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"], + shadows = [JoyConPadTest.RecordingWriter::class]) +class DeckControlsPanelTest { + @Test fun takesTouchAtMatchesWhatATouchDoes() { + val directory = Files.createTempDirectory("deck-panel").toFile() + try { + SessionState.deckPad = false + // No pad: the Deck layouts (trackpads, grips). A pad without Deck controls: the gamepad layout + // (sticks, d-pad, face buttons). + for (pad in listOf(null, PadBridge(directory))) for (portraitDock in listOf(false, true)) { + val name = "pad=${pad != null} portraitDock=$portraitDock" + val panel = DeckControlsPanel(RuntimeEnvironment.getApplication(), onClose = {}, onSteamMenu = {}, onQam = {}, + pad = pad, portraitDock = portraitDock) + assertEquals(name, pad == null, panel.deckControls) + // The portrait dock sits under a portrait game; its gamepad layout needs a tall panel. + val (w, h) = if (portraitDock) 720 to 1000 else 1200 to 480 + panel.measure(View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)) + panel.layout(0, 0, w, h) + var taken = 0 + var missed = 0 + for (x in 0 until w step w / 40) for (y in 0 until h step h / 24) { + val expected = panel.takesTouchAt(x.toFloat(), y.toFloat()) + val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, x.toFloat(), y.toFloat(), 0) + assertEquals("$name ($x, $y)", expected, panel.dispatchTouchEvent(down)) + down.recycle() + // Cancel rather than lift, so no button fires its action. + MotionEvent.obtain(0L, 1L, MotionEvent.ACTION_CANCEL, x.toFloat(), y.toFloat(), 0).also { panel.dispatchTouchEvent(it); it.recycle() } + if (expected) taken++ else missed++ + } + assertTrue("$name: some points land on controls", taken > 0) + assertTrue("$name: some points land between them", missed > 0) + } + } finally { + directory.deleteRecursively() + } + } +}