From b474cba79e08834605887eafdde4675a8145d024 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 7 Nov 2026 14:36:30 -0500 Subject: [PATCH] fix(dual-screen): bring back the trackpad and Deck panels on the second screen (#2229) Keyboard + trackpad and Deck grips + trackpads are second-screen panels again, rendering the stock layouts without changing the input profile. The last panel is remembered separately for desktop and game sessions; desktop sessions start on the trackpad. A Deck panel without the Deck pad falls back to the default. Stock panels left Steam blue return to the neutral look once. --- .../com/droiddeck/launcher/SessionActivity.kt | 71 ++++---- .../launcher/input/InputLibraries.kt | 4 +- .../droiddeck/launcher/input/InputLibrary.kt | 7 +- .../launcher/input/SecondScreenMode.kt | 13 +- .../launcher/session/SessionPrefs.kt | 12 +- .../launcher/ui/SecondScreenPresentation.kt | 26 +-- .../droiddeck/launcher/ui/SessionOverlay.kt | 5 +- .../launcher/input/InputLibraryTest.kt | 13 ++ .../launcher/input/SecondScreenModeTest.kt | 15 +- .../input/SecondScreenProfileMigrationTest.kt | 164 ++++++++---------- .../launcher/ui/SessionSecondScreenTest.kt | 2 +- 11 files changed, 169 insertions(+), 163 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 42b2804f7e..d65f8bd33d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -223,7 +223,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var handCamera: com.droiddeck.launcher.handtracking.HandCamera? = null private var padMotion: com.droiddeck.launcher.input.PadMotion? = null private var resumed by mutableStateOf(false) - private val deckPadListener: () -> Unit = { uiHandler.post { updatePadMotion(); openDeckRing("deck pad changed"); applyUnfoldedControls() } } + private val deckPadListener: () -> Unit = { uiHandler.post { updatePadMotion(); openDeckRing("deck pad changed"); applyUnfoldedControls(); leaveDeckPanel() } } private fun openDeckRing(why: String) { val deck = SessionState.deckPad @@ -1378,7 +1378,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onSecondScreenMode = { mode -> if (docked) drawerOpen = false typingReturnMode = null - if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this@SessionActivity, mode.id) + if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this@SessionActivity, desktopSession, mode.id) selectSecondScreenMode(mode) }, onSecondScreenDisplay = ::selectSecondScreenDisplay, @@ -3282,17 +3282,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId - selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty(), - com.droiddeck.launcher.session.BottomDesktop.available())) + selectSecondScreenMode(openingPanel()) dualControlsProvisional = ::loading.isInitialized && loading.visible } + private val desktopSession get() = loadingMode() == SessionService.MODE_DESKTOP + + private fun leaveDeckPanel() { + if (secondScreenMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad) selectSecondScreenMode(secondScreenMode) + } + + private fun openingPanel() = SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this, desktopSession), SessionState.deckPad, + bottomPages().isNotEmpty(), com.droiddeck.launcher.session.BottomDesktop.available(), desktopSession) + private fun settleDualScreenControls() { if (!dualControlsProvisional || pipUi || !started || (::loading.isInitialized && loading.visible)) return dualControlsProvisional = false if (secondScreenMode == SecondScreenMode.NONE) return - val wanted = SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty(), - com.droiddeck.launcher.session.BottomDesktop.available()) + val wanted = openingPanel() if (wanted != secondScreenMode) selectSecondScreenMode(wanted) else secondScreenPresentation?.retryTerminal() } @@ -3314,7 +3321,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return } if (secondScreenDisplays.isEmpty()) { - secondScreenMode = SecondScreenMode.NONE + panelMode(SecondScreenMode.NONE) return } if (selectedSecondScreenDisplay !in secondScreenDisplays.map { it.id }) { @@ -3325,27 +3332,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun showSecondScreen(requested: SecondScreenMode) { if (pipUi || !started) return - val mode = if (requested == SecondScreenMode.DECK_CONTROLS || requested == SecondScreenMode.KEYBOARD_TRACKPAD) { - val remembered = SessionPrefs.secondScreenPanel(this) - if (remembered == requested.id) { - val desktop = SessionState.mode == SessionService.MODE_DESKTOP - val key = if (desktop) InputProfile.DESKTOP else InputProfile.GAME - val preset = if (requested == SecondScreenMode.DECK_CONTROLS) com.droiddeck.launcher.input.InputStockLayouts.DECK else com.droiddeck.launcher.input.InputStockLayouts.TRACKPAD - runCatching { - com.droiddeck.launcher.input.InputLibraries.update(this) { library -> - val selection = library.selections[key] - if (selection?.profileSelected == true || selection?.parts?.containsKey(InputRole.SECONDARY) == true) library - else library.selectPart(desktop, InputRole.SECONDARY, preset) - } - }.onSuccess { - refreshInputProfile() - SessionPrefs.setSecondScreenPanel(this, SecondScreenMode.CUSTOM_CONTROLS.id) - }.onFailure { - Log.w(TAG, "could not migrate the saved second-screen selection", it) - } - } - SecondScreenMode.CUSTOM_CONTROLS - } else requested + val mode = if (requested == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad) openingPanel() else requested val target = displayManager.getDisplay(selectedSecondScreenDisplay) if (target == null || !target.isValid || (target.flags and Display.FLAG_PRESENTATION) == 0) { closeSecondScreen(reset = false) @@ -3353,8 +3340,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId) || bottomGame?.display?.displayId == target.displayId) { if (secondScreenPresentation != null) closeSecondScreen(reset = false) - secondScreenMode = mode - SessionState.secondScreenMode = mode + panelMode(mode) return } var presentation = secondScreenPresentation @@ -3367,8 +3353,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { try { if (!presentation.isShowing) presentation.show() presentation.showMode(mode) - secondScreenMode = mode - SessionState.secondScreenMode = mode + panelMode(mode) SessionState.secondScreenDisplay = selectedSecondScreenDisplay updateKeyboardRoute() } catch (e: Exception) { @@ -3506,10 +3491,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun refreshInputProfile() { val library = com.droiddeck.launcher.input.InputLibraries.read(this) val desktop = loadingMode() == SessionService.MODE_DESKTOP - inputProfile = library.compileActive(desktop) + inputProfile = library.compileActive(desktop, secondScreenMode.bindings) primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY) adaptiveSticks = primaryInputLayout?.adaptiveSticks - secondaryInputLayout = library.activeLayout(desktop, InputRole.SECONDARY) + secondaryInputLayout = library.panelLayout(desktop, secondScreenMode.bindings) inputUsesLocalActions = InputControl.padControls.any { inputProfile.action(InputRole.PHYSICAL, it) !is InputAction.Native } inputUsesPointer = inputProfile.bindings.values.any { bindings -> bindings.values.any { it is InputAction.Pointer || it is InputAction.MouseButton || it is InputAction.Scroll } @@ -3590,7 +3575,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (drawerOpen || drawerPinned) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId - selectSecondScreenMode(SecondScreenMode.CUSTOM_CONTROLS) + selectSecondScreenMode(SecondScreenMode.KEYBOARD_TRACKPAD) } return secondScreenPresentation?.takeIf { it.showsKeyboard && it.display != null } } @@ -3688,7 +3673,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId) val mode = typingReturnMode ?: return typingReturnMode = null - uiHandler.post { if (secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS) selectSecondScreenMode(mode) } + uiHandler.post { if (secondScreenMode == SecondScreenMode.KEYBOARD_TRACKPAD) selectSecondScreenMode(mode) } } private fun updateKeyboardRoute() { @@ -3712,10 +3697,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (focused && started) com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId) else com.droiddeck.launcher.ui.SessionTyping.close() updateKeyboardRoute() - if (reset) { - secondScreenMode = SecondScreenMode.NONE - SessionState.secondScreenMode = SecondScreenMode.NONE - } + if (reset) panelMode(SecondScreenMode.NONE) + } + + private fun panelMode(mode: SecondScreenMode) { + val rebind = secondScreenMode.bindings != mode.bindings + secondScreenMode = mode + SessionState.secondScreenMode = mode + if (rebind) refreshInputProfile() } private fun effectiveTouchMode(): String { @@ -5000,7 +4989,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, modifier = Modifier.fillMaxSize(), ) - secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS -> { + secondScreenMode.controls && (secondScreenMode != SecondScreenMode.DECK_CONTROLS || SessionState.deckPad) -> { androidx.compose.runtime.key(profileLayout) { androidx.compose.ui.viewinterop.AndroidView( factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge, profileLayout?.elements.orEmpty(), diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index 44305456ae..52a41324b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -9,7 +9,7 @@ import org.json.JSONObject import java.util.UUID object InputLibraries { - private const val VERSION = 10 + private const val VERSION = 11 private const val KEY = "library" private const val RECOVERY = "library-recovery." const val OVERLAY = "builtin.overlay" @@ -27,7 +27,7 @@ object InputLibraries { var library = decoded ?: scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, migrate(context)))) val version = raw?.let { JSONObject(it).getInt("version") } ?: 0 if (version < 5) library = scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, library))) - if (version < 9) library = neutralStockLayouts(library) + if (version < 11) library = neutralStockLayouts(library) if (version < 10) library = restyleGamepads(context, library) if (version < 6 || !p.contains(LegacyScreenKeyMigration.BACKUP)) { val legacy = LegacyScreenKeyMigration.snapshot(context) 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 49ab822b24..03bc353cb2 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -81,7 +81,12 @@ data class InputLibrary( return if (binding != null) InputPart(binding.id, binding.layoutId) else profile(activeId(isDesktop)).parts.getValue(role) } fun activeLayout(isDesktop: Boolean, role: InputRole) = activePart(isDesktop, role).layout?.let { id -> layouts.first { it.id == id } } - fun compileActive(isDesktop: Boolean): InputProfile = compileParts(activeId(isDesktop), InputRole.entries.associateWith { preset(activePart(isDesktop, it).bindings) }) + fun panelPart(isDesktop: Boolean, panel: String?): InputPart = + panel?.let { id -> bindings.firstOrNull { it.id == id } }?.let { InputPart(it.id, it.layoutId) } ?: activePart(isDesktop, InputRole.SECONDARY) + fun panelLayout(isDesktop: Boolean, panel: String?) = panelPart(isDesktop, panel).layout?.let { id -> layouts.firstOrNull { it.id == id } } + 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 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/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt index 3cbc12a227..90ed7efdb8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -5,23 +5,26 @@ import android.view.Display import androidx.annotation.StringRes import com.droiddeck.launcher.R -enum class SecondScreenMode(val id: String, @StringRes val label: Int) { +enum class SecondScreenMode(val id: String, @StringRes val label: Int, val bindings: String? = null) { NONE("none", R.string.second_mode_none), - KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad), + KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad, InputStockLayouts.TRACKPAD), TERMINAL("terminal", R.string.second_mode_terminal), - DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls), + DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls, InputStockLayouts.DECK), CUSTOM_CONTROLS("custom-controls", R.string.input_profile_controls_mode), DASHBOARD("dashboard", R.string.second_mode_dashboard), DESKTOP("desktop", R.string.second_mode_desktop); + val controls: Boolean get() = this == CUSTOM_CONTROLS || bindings != null + companion object { - fun opening(remembered: String?, deckPad: Boolean, dashboard: Boolean = false, desktop: Boolean = false): SecondScreenMode { + fun opening(remembered: String?, deckPad: Boolean, dashboard: Boolean = false, bottomDesktop: Boolean = false, desktopSession: Boolean = false): SecondScreenMode { entries.firstOrNull { it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) && (it != DASHBOARD || dashboard) && - (it != DESKTOP || desktop) + (it != DESKTOP || bottomDesktop) }?.let { return it } val picked = entries.any { it != NONE && it.id == remembered } return when { + desktopSession -> KEYBOARD_TRACKPAD deckPad -> DECK_CONTROLS dashboard && !picked -> DASHBOARD else -> KEYBOARD_TRACKPAD diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 2abf094c0f..fa0a689ba5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -110,12 +110,16 @@ object SessionPrefs { prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", launcher).putString("dualScreenSessionMode", mode).apply() } - fun secondScreenPanel(context: Context): String? = prefs(context).getString("secondScreenPanel", null) - - fun setSecondScreenPanel(context: Context, mode: String) { - prefs(context).edit().putString("secondScreenPanel", mode).apply() + fun secondScreenPanel(context: Context, desktop: Boolean): String? = prefs(context).let { + it.getString(secondScreenPanelKey(desktop), null) ?: if (desktop) null else it.getString("secondScreenPanel", null)?.takeIf { id -> id != "custom-controls" } } + fun setSecondScreenPanel(context: Context, desktop: Boolean, mode: String) { + prefs(context).edit().putString(secondScreenPanelKey(desktop), mode).apply() + } + + private fun secondScreenPanelKey(desktop: Boolean) = if (desktop) "secondScreenPanel.desktop" else "secondScreenPanel.game" + /** The bottom-screen desktop takes touch as a trackpad unless the user switched it to direct touch. */ fun bottomDesktopDirectTouch(context: Context): Boolean = prefs(context).getBoolean("bottomDesktopDirectTouch", false) 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 5e9e004e07..718873661f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -119,9 +119,8 @@ class SecondScreenPresentation( } fun showMode(mode: SecondScreenMode) { - val next = if (mode == SecondScreenMode.KEYBOARD_TRACKPAD || mode == SecondScreenMode.DECK_CONTROLS) SecondScreenMode.CUSTOM_CONTROLS else mode - if (currentMode == next && isShowing) return - currentMode = next + if (currentMode == mode && isShowing) return + currentMode = mode if (created) renderMode() } @@ -160,7 +159,7 @@ class SecondScreenPresentation( view.disposeComposition() } - val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.CUSTOM_CONTROLS + val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode.controls val showsControls: Boolean get() = isShowing && currentMode != SecondScreenMode.NONE @@ -237,10 +236,9 @@ class SecondScreenPresentation( } fun refreshControls() { - if (!created || currentMode != SecondScreenMode.CUSTOM_CONTROLS) return + if (!created || !currentMode.controls) return val controls = controlsView ?: return - val layout = com.droiddeck.launcher.input.InputLibraries.read(context) - .activeLayout(SessionState.mode == SessionService.MODE_DESKTOP, com.droiddeck.launcher.input.InputRole.SECONDARY) + val layout = panelLayout(currentMode) controls.updateCustomLayout(layout?.elements.orEmpty()) controls.updateStyle(layout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) } @@ -274,10 +272,9 @@ class SecondScreenPresentation( root.removeAllViews() controlsView = null ownComposeViews() - val library = com.droiddeck.launcher.input.InputLibraries.read(context) - val profileLayout = library.activeLayout(SessionState.mode == SessionService.MODE_DESKTOP, com.droiddeck.launcher.input.InputRole.SECONDARY) val requested = currentMode val mode = when { + requested == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad -> SecondScreenMode.NONE requested == SecondScreenMode.DASHBOARD && dashboard == null -> SecondScreenMode.NONE requested == SecondScreenMode.DESKTOP && !BottomDesktop.available() -> SecondScreenMode.NONE else -> requested @@ -286,14 +283,14 @@ class SecondScreenPresentation( when (mode) { SecondScreenMode.TERMINAL -> renderTerminal() - SecondScreenMode.CUSTOM_CONTROLS -> { - val controls = InputSurfaceView(context, pad, profileLayout?.elements.orEmpty(), - surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) + SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.DECK_CONTROLS -> { + val layout = panelLayout(mode) + val controls = InputSurfaceView(context, pad, layout?.elements.orEmpty(), + surfaceStyle = layout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) controlsView = controls root.addView(controls, weightParams()) attachKeyboard() } - SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.DECK_CONTROLS -> Unit SecondScreenMode.DASHBOARD -> renderDashboard() SecondScreenMode.DESKTOP -> { root.addView(BottomDesktopPanel(context, onClose, onMenu, @@ -303,6 +300,9 @@ class SecondScreenPresentation( } } + private fun panelLayout(mode: SecondScreenMode) = com.droiddeck.launcher.input.InputLibraries.read(context) + .panelLayout(SessionState.mode == SessionService.MODE_DESKTOP, mode.bindings) + private fun bar(mode: SecondScreenMode, extras: () -> List = { emptyList() }) { root.addView(bottomScreenBarView(context) { sessionBarModel(context.getString(mode.label), onClose, onMenu, onSteamMenu, onQam, extras()) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index c4803e7a22..c1ce2cd1f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -428,7 +428,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont page == SessionDrawerPage.GLASSES -> "glasses-tab-$glassesTab" page == SessionDrawerPage.SESSION && a.isHomeApp -> "apps" page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:" + - (if (a.secondScreenMode == SecondScreenMode.NONE && !a.secondScreenNone) SecondScreenMode.CUSTOM_CONTROLS else a.secondScreenMode).id + (if (a.secondScreenMode == SecondScreenMode.NONE && !a.secondScreenNone) SecondScreenMode.KEYBOARD_TRACKPAD else a.secondScreenMode).id else -> page.firstControl } if (turned) focus.forget(page) @@ -1158,7 +1158,8 @@ private fun SteamVrRow(a: DrawerActions) { } internal fun secondScreenModes(none: Boolean, deckPad: Boolean, dashboard: Boolean, desktop: Boolean): List = - (if (none) listOf(SecondScreenMode.NONE) else emptyList()) + listOf(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) + + (if (none) listOf(SecondScreenMode.NONE) else emptyList()) + listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL) + + (if (deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList()) + listOf(SecondScreenMode.CUSTOM_CONTROLS) + (if (dashboard) listOf(SecondScreenMode.DASHBOARD) else emptyList()) + (if (desktop) listOf(SecondScreenMode.DESKTOP) else emptyList()) 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 dc63d19dd2..3051116687 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt @@ -520,4 +520,17 @@ class InputLibraryTest { assertNull(InputLibraries.read(context).layouts.single { it.id == "mine" }.style.tint) assertEquals(InputLibraries.read(context), InputLibraries.read(context)) } + + @Test fun versionTenStockPanelsReturnToGrayOnce() { + val fresh = InputLibraries.read(context) + val blue = fresh.layouts.filter { it.id == InputLibraries.DECK || it.id == InputLibraries.TRACKPAD } + .map { it.copy(style = it.style.copy(tint = ControllerPrefs.STEAM_BLUE)) } + val old = JSONObject(InputLibraries.encode(blue.fold(fresh) { library, layout -> library.withLayout(layout) })).put("version", 10) + prefs.edit().putString("library", old.toString()).commit() + val upgraded = InputLibraries.read(context) + assertNull(upgraded.layouts.single { it.id == InputLibraries.DECK }.style.tint) + assertNull(upgraded.layouts.single { it.id == InputLibraries.TRACKPAD }.style.tint) + assertEquals(ControllerPrefs.STEAM_BLUE, upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.style.tint) + assertEquals(upgraded, InputLibraries.read(context)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt index 0888984c4a..3da439ee5c 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt @@ -46,13 +46,22 @@ class SecondScreenModeTest { } @Test fun theDesktopOpensAgainOnlyWhileItCanRun() { - assertEquals(SecondScreenMode.DESKTOP, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true, desktop = true)) + assertEquals(SecondScreenMode.DESKTOP, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true, bottomDesktop = true)) assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("desktop", deckPad = false)) } @Test fun withNothingRememberedTheDesktopIsNeverPicked() { - assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true, desktop = true)) - assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false, desktop = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true, bottomDesktop = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false, bottomDesktop = true)) + } + + @Test fun desktopSessionsOpenTheTrackpadUntilTheUserPicksAnotherPanel() { + for (deckPad in listOf(false, true)) for (dashboard in listOf(false, true)) { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad, dashboard, desktopSession = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("gone", deckPad, dashboard, desktopSession = true)) + assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.opening("custom-controls", deckPad, dashboard, desktopSession = true)) + assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad, dashboard, desktopSession = true)) + } } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt index a14dcbbc6b..669db39752 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.input import android.content.Context +import android.content.Intent import android.hardware.display.DisplayManager import android.view.Display import androidx.compose.runtime.MutableState @@ -8,7 +9,6 @@ import com.droiddeck.launcher.SessionActivity import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState -import org.json.JSONObject import org.junit.After import org.junit.Assert.* import org.junit.Before @@ -27,6 +27,7 @@ class SecondScreenProfileMigrationTest { private val previousMode = SessionState.mode private val previousPanel = SessionState.secondScreenMode private val previousDisplay = SessionState.secondScreenDisplay + private val previousDeckPad = SessionState.deckPad @Before fun setUp() { SessionState.secondScreenMode = SecondScreenMode.NONE @@ -44,110 +45,78 @@ class SecondScreenProfileMigrationTest { SessionState.mode = previousMode SessionState.secondScreenMode = previousPanel SessionState.secondScreenDisplay = previousDisplay + SessionState.deckPad = previousDeckPad } - @Test fun automaticOpeningKeepsCustomLayoutsAndBindingsInBothSessionModes() { + @Test fun firstOpeningKeepsTheLibraryAndOpensTheTrackpadOnDesktopAndTheControllerPanelInGames() { for (desktop in listOf(false, true)) for (deckPad in listOf(false, true)) { val original = customLibrary(desktop) - open(null, deckPad) + open(desktop, deckPad) assertEquals(original, InputLibraries.read(activity)) - assertNull(SessionPrefs.secondScreenPanel(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SessionState.secondScreenMode) - } - } - - @Test fun unavailableOrUnknownPanelsDoNotReplaceCustomControls() { - for (remembered in listOf("none", "gone", "dashboard", "desktop")) for (deckPad in listOf(false, true)) { - val original = customLibrary(desktop = false) - SessionPrefs.setSecondScreenPanel(activity, remembered) - open(remembered, deckPad) - assertEquals(original, InputLibraries.read(activity)) - assertEquals(remembered, SessionPrefs.secondScreenPanel(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SessionState.secondScreenMode) - } - } - - @Test fun explicitlySavedLegacyPanelsStillMigrateOnlyTheCurrentMode() { - for (desktop in listOf(false, true)) for (legacy in listOf(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.KEYBOARD_TRACKPAD)) { - val original = customLibrary(desktop) - SessionPrefs.setSecondScreenPanel(activity, legacy.id) - open(legacy.id, deckPad = true) - val preset = if (legacy == SecondScreenMode.DECK_CONTROLS) InputStockLayouts.DECK else InputStockLayouts.TRACKPAD - val expected = original.selectPart(desktop, InputRole.SECONDARY, preset) - assertEquals(expected, InputLibraries.read(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) - open(SessionPrefs.secondScreenPanel(activity), deckPad = true) - assertEquals(expected, InputLibraries.read(activity)) - } - } - - @Test fun legacyPanelsDoNotReplaceAnExistingQuickSelection() { - customLibrary(desktop = true) - val original = InputLibraries.update(activity) { it.selectPart(true, InputRole.SECONDARY, "custom.bindings") } - SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.DECK_CONTROLS.id) - open(SecondScreenMode.DECK_CONTROLS.id, deckPad = true) - assertEquals(original, InputLibraries.read(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) - } - - @Test fun unrelatedPartSelectionsDoNotSkipTheSavedPanelMigration() { - for (desktop in listOf(false, true)) for (role in listOf(InputRole.PHYSICAL, InputRole.PRIMARY)) { - customLibrary(desktop) - val original = InputLibraries.update(activity) { it.selectPart(desktop, role, it.profile("game").binding(role)) } - SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.KEYBOARD_TRACKPAD.id) - open(SecondScreenMode.KEYBOARD_TRACKPAD.id, deckPad = true) - assertEquals(original.selectPart(desktop, InputRole.SECONDARY, InputStockLayouts.TRACKPAD), InputLibraries.read(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) - } - } - - @Test fun explicitProfilesIncludingAutoKeepTheirSecondaryLayoutAfterOtherPartChanges() { - for (desktop in listOf(false, true)) for (profile in listOf(InputProfiles.AUTO, InputProfile.GAME, InputProfile.DESKTOP)) { - for (role in listOf(null, InputRole.PHYSICAL, InputRole.PRIMARY)) { - customLibrary(desktop) - val original = InputLibraries.update(activity) { library -> - val selected = library.selectProfile(desktop, profile) - if (role == null) selected else selected.selectPart(desktop, role, selected.profile("game").binding(role)) - } - SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.DECK_CONTROLS.id) - open(SecondScreenMode.DECK_CONTROLS.id, deckPad = true) - assertEquals(original, InputLibraries.read(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) + assertNull(SessionPrefs.secondScreenPanel(activity, desktop)) + val dashboard = ReflectionHelpers.callInstanceMethod>(activity, "bottomPages").isNotEmpty() + val expected = when { + desktop -> SecondScreenMode.KEYBOARD_TRACKPAD + deckPad -> SecondScreenMode.DECK_CONTROLS + dashboard -> SecondScreenMode.DASHBOARD + else -> SecondScreenMode.KEYBOARD_TRACKPAD } + assertEquals(expected, SessionState.secondScreenMode) } } - @Test fun unavailableDeckPanelKeepsItsSavedChoiceUntilItCanMigrate() { - for (desktop in listOf(false, true)) { + @Test fun desktopAndGamesEachReopenTheirOwnLastPanel() { + customLibrary(desktop = false) + SessionPrefs.setSecondScreenPanel(activity, true, SecondScreenMode.TERMINAL.id) + SessionPrefs.setSecondScreenPanel(activity, false, SecondScreenMode.CUSTOM_CONTROLS.id) + open(desktop = true, deckPad = true) + assertEquals(SecondScreenMode.TERMINAL, SessionState.secondScreenMode) + open(desktop = false, deckPad = true) + assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SessionState.secondScreenMode) + } + + @Test fun theSharedPanelChoiceCarriesOverToGamesExceptTheForcedProfileControls() { + val prefs = activity.getSharedPreferences("session", Context.MODE_PRIVATE) + prefs.edit().putString("secondScreenPanel", SecondScreenMode.TERMINAL.id).commit() + assertEquals(SecondScreenMode.TERMINAL.id, SessionPrefs.secondScreenPanel(activity, false)) + assertNull(SessionPrefs.secondScreenPanel(activity, true)) + customLibrary(desktop = true) + open(desktop = true, deckPad = true) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SessionState.secondScreenMode) + prefs.edit().putString("secondScreenPanel", SecondScreenMode.CUSTOM_CONTROLS.id).commit() + for (desktop in listOf(false, true)) assertNull(SessionPrefs.secondScreenPanel(activity, desktop)) + } + + @Test fun trackpadAndDeckPanelsUseTheirStockBindingsWithoutChangingTheProfile() { + for (desktop in listOf(false, true)) for (mode in listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.DECK_CONTROLS)) { val original = customLibrary(desktop) - SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.DECK_CONTROLS.id) - open(SecondScreenMode.DECK_CONTROLS.id, deckPad = false) + SessionState.deckPad = true + val stock = original.preset(mode.bindings!!) + show(mode) assertEquals(original, InputLibraries.read(activity)) - assertEquals(SecondScreenMode.DECK_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) - open(SessionPrefs.secondScreenPanel(activity), deckPad = true) - assertEquals(original.selectPart(desktop, InputRole.SECONDARY, InputStockLayouts.DECK), InputLibraries.read(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) + assertEquals(stock.layoutId, routedLayout()?.id) + assertEquals(stock.elements, routedProfile().elements[InputRole.SECONDARY].orEmpty()) + show(SecondScreenMode.CUSTOM_CONTROLS) + assertEquals("custom.layout", routedLayout()?.id) + assertEquals(InputAction.Keys(listOf(57)), routedProfile().elementAction(InputRole.SECONDARY, "custom.button", InputControl.A)) } } - @Test fun failedMigrationKeepsTheSavedPanelAndCanBeRetried() { - val original = customLibrary(desktop = false) - val prefs = activity.getSharedPreferences("input-profiles", Context.MODE_PRIVATE) - val valid = prefs.getString("library", null)!! - val unsupported = JSONObject(valid).put("version", 999).toString() - prefs.edit().putString("library", unsupported).commit() - SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.KEYBOARD_TRACKPAD.id) - open(SecondScreenMode.KEYBOARD_TRACKPAD.id, deckPad = true) - assertEquals(unsupported, prefs.getString("library", null)) - assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD.id, SessionPrefs.secondScreenPanel(activity)) - prefs.edit().putString("library", valid).commit() - open(SessionPrefs.secondScreenPanel(activity), deckPad = true) - assertEquals(original.selectPart(false, InputRole.SECONDARY, InputStockLayouts.TRACKPAD), InputLibraries.read(activity)) - assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity)) + @Test fun aDeckPanelLeftOverWithoutTheDeckPadOpensTheFallbackInstead() { + for (desktop in listOf(false, true)) { + customLibrary(desktop) + SessionState.deckPad = false + show(SecondScreenMode.DECK_CONTROLS) + val fallback = ReflectionHelpers.callInstanceMethod(activity, "openingPanel") + assertNotEquals(SecondScreenMode.DECK_CONTROLS, fallback) + if (desktop) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, fallback) + assertEquals(fallback, SessionState.secondScreenMode) + assertNotEquals(InputLibraries.DECK, routedLayout()?.id) + } } private fun customLibrary(desktop: Boolean): InputLibrary { - SessionState.mode = if (desktop) SessionService.MODE_DESKTOP else SessionService.MODE_STEAM + session(desktop) return InputLibraries.update(activity) { library -> val id = if (desktop) InputProfile.DESKTOP else InputProfile.GAME val element = InputSurfaceElement(InputControl.A, .3f, .2f, .2f, .2f, "custom.button") @@ -161,8 +130,21 @@ class SecondScreenProfileMigrationTest { } } - private fun open(remembered: String?, deckPad: Boolean) { - val mode = SecondScreenMode.opening(remembered, deckPad) - ReflectionHelpers.callInstanceMethod(activity, "showSecondScreen", ReflectionHelpers.ClassParameter.from(SecondScreenMode::class.java, mode)) + private fun routedProfile(): InputProfile = ReflectionHelpers.getField(activity, "inputProfile") + + private fun routedLayout(): SavedInputLayout? = ReflectionHelpers.getField>(activity, "secondaryInputLayout\$delegate").value + + private fun session(desktop: Boolean) { + SessionState.mode = if (desktop) SessionService.MODE_DESKTOP else SessionService.MODE_STEAM + activity.intent = Intent().putExtra(SessionService.EXTRA_MODE, SessionState.mode) } + + private fun open(desktop: Boolean, deckPad: Boolean) { + session(desktop) + SessionState.deckPad = deckPad + show(ReflectionHelpers.callInstanceMethod(activity, "openingPanel")) + } + + private fun show(mode: SecondScreenMode) = + ReflectionHelpers.callInstanceMethod(activity, "showSecondScreen", ReflectionHelpers.ClassParameter.from(SecondScreenMode::class.java, mode)) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt index 7349b9a57d..12098a566b 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -354,7 +354,7 @@ class SessionSecondScreenTest { SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it }) } } - val modes = listOf(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) + val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL, SecondScreenMode.CUSTOM_CONTROLS) for (mode in modes) { compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick() }