From 7d3d338fb94759b07527b8fe636b3861e717da27 Mon Sep 17 00:00:00 2001
From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com>
Date: Thu, 29 Oct 2026 18:39:17 -0400
Subject: [PATCH] Keep the manual second screen option when Dual screen is Off
(#1777)
---
app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt | 3 +--
app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 3 +--
app/src/main/res/values/strings.xml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
index 4d64fae7bd..3f03afc2c1 100644
--- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt
@@ -1739,8 +1739,7 @@ class FrontEndActivity : ComponentActivity() {
// The launcher can itself be shown on a non-default display (DeX, an external monitor); that one is not a "second screen".
val ownDisplayId = if (android.os.Build.VERSION.SDK_INT >= 30) display?.displayId ?: android.view.Display.DEFAULT_DISPLAY else @Suppress("DEPRECATION") windowManager.defaultDisplay.displayId
dualScreenMode = SessionPrefs.dualScreenMode(this)
- secondScreenDisplays = if (dualScreenMode == com.droiddeck.launcher.input.DualScreen.MODE_OFF) emptyList()
- else SecondScreenDisplays.available(displayManager, ownDisplayId)
+ secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId)
dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null
dualScreenLauncher = SessionPrefs.dualScreenLauncher(this)
dualScreenControls = SessionPrefs.dualScreenSessionControls(this)
diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
index a4c50446c2..63dfb00755 100644
--- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
@@ -2909,9 +2909,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun refreshSecondScreenDisplays() {
if (!::displayManager.isInitialized) return
val primaryId = shownOnDisplayId
- val dualOff = SessionPrefs.dualScreenMode(this) == com.droiddeck.launcher.input.DualScreen.MODE_OFF
val candidates = SecondScreenDisplays.available(displayManager, primaryId)
- .filter { !dualOff && (glassesScreen == null || it.id != glasses.displayId) }
+ .filter { glassesScreen == null || it.id != glasses.displayId }
val oldIds = secondScreenDisplays.map { it.id }.toSet()
secondScreenDisplays = candidates
val newIds = candidates.map { it.id }.toSet()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31c6664e7a..6c61118021 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -927,7 +927,7 @@
Hides the Android status and navigation bars
Shows the Android status and navigation bars
Dual screen
- Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps everything on one screen.
+ Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps the launcher and games on one screen; you can still pick a second screen from the session menu.
Automatic
On
Off