diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 169969dcd..8b55d1d7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -5389,7 +5389,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde controls.releaseAll(); controls.visibility = View.GONE if (!plan.shown) { steam.cancelEditing(); steam.releaseAll() } steam.visibility = if (plan.shown) View.VISIBLE else View.GONE - com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = plan.shown + // Steam takes seconds to configure a newly plugged touch controller, so hiding the layout keeps it plugged. + com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = true applyTouchRouting() return } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt index 16a466005..b3868afb1 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt @@ -96,6 +96,22 @@ class SessionKeyboardPadTest { assertEquals(SessionPrefs.TOUCH_OFF, routedTouchMode()) } + @Test fun hidingTheSteamLayoutForAControllerKeepsSteamsTouchControllerPlugged() { + SteamTouchDevice.prepare(directory) + val steam = SteamTouchControls(activity, SteamTouchDevice.current!!, {}, {}) + ReflectionHelpers.setField(activity, "steamTouchControls", steam) + SessionPrefs.setOscMode(activity, SessionPrefs.OSC_AUTO) + SessionPrefs.setSteamTouchLayout(activity, true) + ReflectionHelpers.setField(activity, "controlsHiddenByTap", true) + update() + assertEquals(View.GONE, steam.visibility) + assertTrue(SteamTouchDevice.current!!.plugged) + ReflectionHelpers.setField(activity, "controlsHiddenByTap", false) + update() + assertEquals(View.VISIBLE, steam.visibility) + assertTrue(SteamTouchDevice.current!!.plugged) + } + @Test fun endingTheAgentForgetsSteamsKeyboard() { steamKeyboard(true) AgentGuest.stop()