From 2b0d63353531ed8294d78fa948cb8060520cfda5 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 29 Oct 2026 23:45:06 -0400 Subject: [PATCH] fix: the Duo's bottom screen keeps the panel you picked across games (#1803) --- .../com/droiddeck/launcher/SessionActivity.kt | 9 +++++-- .../launcher/input/SecondScreenMode.kt | 7 ++++- .../launcher/session/SessionPrefs.kt | 6 +++++ .../launcher/input/SecondScreenModeTest.kt | 26 +++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index c9dfb374fa..aac2d6c991 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1280,7 +1280,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { screenLayoutsOpen = true }, onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() }, - onSecondScreenMode = { mode -> if (docked) drawerOpen = false; typingReturnMode = null; selectSecondScreenMode(mode) }, + onSecondScreenMode = { mode -> + if (docked) drawerOpen = false + typingReturnMode = null + if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this@SessionActivity, mode.id) + selectSecondScreenMode(mode) + }, onSecondScreenDisplay = ::selectSecondScreenDisplay, onLaunchAndroidApp = { app, displayId -> drawerOpen = false @@ -2956,7 +2961,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId - selectSecondScreenMode(if (SessionState.deckPad) SecondScreenMode.DECK_CONTROLS else SecondScreenMode.KEYBOARD_TRACKPAD) + selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad)) } private fun selectSecondScreenDisplay(displayId: Int) { 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 6789654f7a..019ac686cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -9,7 +9,12 @@ enum class SecondScreenMode(val id: String, @StringRes val label: Int) { NONE("none", R.string.second_mode_none), KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_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); + + companion object { + fun opening(remembered: String?, deckPad: Boolean): SecondScreenMode = + entries.firstOrNull { it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) } ?: if (deckPad) DECK_CONTROLS else KEYBOARD_TRACKPAD + } } data class SecondScreenDisplay(val id: Int, val label: String) 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 aa100039cf..1c923885ba 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -94,6 +94,12 @@ object SessionPrefs { prefs(context).edit().putString("dualScreenMode", 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 dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true) fun setDualScreenLauncher(context: Context, on: Boolean) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt new file mode 100644 index 0000000000..da6b3bec2e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.input + +import org.junit.Assert.assertEquals +import org.junit.Test + +class SecondScreenModeTest { + @Test fun withNothingRememberedTheControllerPicksThePanel() { + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening(null, deckPad = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false)) + } + + @Test fun thePanelTheUserPickedLastOpensAgain() { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("deck-controls", deckPad = true)) + assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad = true)) + } + + @Test fun deckControlsNeedTheDeckPad() { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false)) + } + + @Test fun anUnknownOrClosedChoiceFallsBackToTheDefault() { + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("none", deckPad = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("gone", deckPad = false)) + } +}