From 9d6251c37b8c5d3eac0c09635a90b8fc0a17194f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 15 Oct 2026 23:54:43 +0300 Subject: [PATCH] feat: the second-screen Deck controls get the Gamepad tab (#895) --- app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 1 + .../com/droiddeck/launcher/ui/SecondScreenPresentation.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 44e710d38b..4b2bb6b2a1 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1874,6 +1874,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onSteamMenu = ::tapSteamButton, onQam = ::tapQam, onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, + pad = padBridge, ) secondScreenPresentation = presentation } 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 913f312eab..25b7959216 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -23,6 +23,7 @@ import android.widget.HorizontalScrollView import android.widget.LinearLayout import android.widget.TextView import com.droiddeck.launcher.input.KeyboardHost +import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.input.TouchpadGestures @@ -45,6 +46,7 @@ class SecondScreenPresentation( private val onSteamMenu: () -> Unit, private val onQam: () -> Unit, private val onClose: () -> Unit, + private val pad: PadBridge? = null, ) : Presentation(sessionActivity, display) { private val root = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL @@ -114,7 +116,7 @@ class SecondScreenPresentation( when (currentMode) { SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad() SecondScreenMode.TERMINAL -> renderTerminal() - SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam), weightParams()) + SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad), weightParams()) SecondScreenMode.NONE -> Unit } }