From 3526309f88258dea7869bb27fc5452b14740adc6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 7 Nov 2026 16:19:40 -0500 Subject: [PATCH] feat(session): setting to choose the Android keyboard for game text fields (#2236) --- .../main/java/com/droiddeck/launcher/FrontEndActivity.kt | 7 +++++++ .../main/java/com/droiddeck/launcher/SessionActivity.kt | 3 ++- .../java/com/droiddeck/launcher/session/SessionPrefs.kt | 6 ++++++ .../java/com/droiddeck/launcher/session/SettingsReset.kt | 2 +- .../main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 2 ++ .../main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt | 2 ++ app/src/main/res/values/strings.xml | 1 + 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index d3744302d8..c7abf97ebc 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -623,6 +623,7 @@ class FrontEndActivity : ComponentActivity() { private var dualScreenMode by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) private var dualScreenSessions by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) private var dualScreenControls by mutableStateOf(true) + private var androidTextFieldKeyboard by mutableStateOf(false) private var launcherStarted = false private lateinit var displayManager: DisplayManager private val secondScreenDisplayListener = object : DisplayManager.DisplayListener { @@ -1176,6 +1177,7 @@ class FrontEndActivity : ComponentActivity() { dualScreenMode = dualScreenMode, dualScreenSessions = dualScreenSessions, dualScreenControls = dualScreenControls, + androidTextFieldKeyboard = androidTextFieldKeyboard, packages = packageRows, packageCatalogLoading = catalogLoading, packageBusyId = pkgId, @@ -1506,6 +1508,10 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDualScreenSessionControls(this, on) dualScreenControls = on }, + onAndroidTextFieldKeyboard = { on -> + SessionPrefs.setAndroidTextFieldKeyboard(this, on) + androidTextFieldKeyboard = on + }, onAnimationsEnabled = { on -> SessionPrefs.setAnimationsEnabled(this, on) animationsEnabled = on @@ -2031,6 +2037,7 @@ class FrontEndActivity : ComponentActivity() { dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null dualScreenSessions = SessionPrefs.dualScreenSessionMode(this) dualScreenControls = SessionPrefs.dualScreenSessionControls(this) + androidTextFieldKeyboard = SessionPrefs.androidTextFieldKeyboard(this) val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId) dualDisplayId = target?.displayId ?: -1 syncDualPanel() diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b6a440937f..fc9fa91f18 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3698,7 +3698,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun updateKeyboardRoute() { AgentGuest.routeKeyboard(this, SessionState.mode == SessionService.MODE_STEAM && - (secondScreenPresentation?.showsKeyboard == true || dockDrawer())) + (secondScreenPresentation?.showsKeyboard == true || dockDrawer()) && + SessionPrefs.androidTextFieldKeyboard(this)) } private fun dropDockedDrawer() { 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 fa0a689ba5..03c64b50aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -188,6 +188,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("dualScreenSessionControls", on).apply() } + fun androidTextFieldKeyboard(context: Context): Boolean = prefs(context).getBoolean("androidTextFieldKeyboard", false) + + fun setAndroidTextFieldKeyboard(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("androidTextFieldKeyboard", on).apply() + } + fun gameStoresEnabled(context: Context): Boolean = prefs(context).getBoolean("gameStoresEnabled", true) fun setGameStoresEnabled(context: Context, on: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 48a1d57be2..efefc0525b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -13,7 +13,7 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", - "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", + "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "androidTextFieldKeyboard", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 3ea185b1fc..84cf3ed27e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -144,6 +144,7 @@ class FrontEndState( val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, val dualScreenSessions: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, val dualScreenControls: Boolean = true, + val androidTextFieldKeyboard: Boolean = false, val packages: List? = null, val packageCatalogLoading: Boolean = false, val packageBusyId: String? = null, @@ -270,6 +271,7 @@ class FrontEndActions( val onDualScreenMode: (String) -> Unit = {}, val onDualScreenSessions: (String) -> Unit = {}, val onDualScreenControls: (Boolean) -> Unit = {}, + val onAndroidTextFieldKeyboard: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, val onDownloadPrefix: (String) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 1f9b47c4b8..6f87642f61 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -514,6 +514,8 @@ internal fun SetupPanel( ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } } + ToggleRow(host, "android-text-field-keyboard", stringResource(R.string.setup_android_text_field_keyboard), + null, s.androidTextFieldKeyboard) { a.onAndroidTextFieldKeyboard(it) } } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ac49f423af..5307166fa8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1015,6 +1015,7 @@ On Off Bottom screen controls in games + Android keyboard for text fields Opens a panel on the second screen when a session starts: the Deck buttons and trackpads with a Steam Deck or Steam Controller, otherwise the one you used last. Typing on the top screen Done