From 952c28316fff308de3e8ea6f1d866d72f5eca79c Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 14:39:20 -0400 Subject: [PATCH] Home screen: a switch in Setup (off by default) instead of a second apk --- app/src/main/AndroidManifest.xml | 5 ++++- .../java/com/droiddeck/launcher/HomeApp.kt | 19 +++++++++++++++++++ .../com/droiddeck/launcher/MainActivity.kt | 9 ++++++++- .../droiddeck/launcher/ui/FrontEndScreen.kt | 11 ++++++++++- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dbd5b4ac62..0fe0362886 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,9 +55,12 @@ + Home launch either back into a running Steam session or to the regular front end. + Off until the user turns on "Use as a Home screen" (Setup): while it is disabled the + app is not a Home app at all - not offered, not in the "choose Home" list. --> = Build.VERSION_CODES.Q) { val roles = context.getSystemService(RoleManager::class.java) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 0617fde309..1d50ac50ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -189,6 +189,7 @@ class MainActivity : ComponentActivity() { private var logsEnabled by mutableStateOf(true) private var showRoms by mutableStateOf(false) private var homeAppSelected by mutableStateOf(false) + private var homeScreenEnabled by mutableStateOf(false) private var defaultHomeLabel by mutableStateOf(null) private var androidApps by mutableStateOf>(emptyList()) private var secondScreenDisplays by mutableStateOf>(emptyList()) @@ -248,6 +249,7 @@ class MainActivity : ComponentActivity() { pageKey = sm?.let { "settings:$it" } ?: if (showPerformance) "performance" else if (showProtons) "protons" else null, theme = theme, isHomeApp = homeAppSelected, + homeScreenEnabled = homeScreenEnabled, defaultHomeLabel = defaultHomeLabel, androidApps = androidApps, secondScreenDisplays = secondScreenDisplays, @@ -318,6 +320,10 @@ class MainActivity : ComponentActivity() { onPageBack = { settingsMode = null; showPerformance = false; showProtons = false }, onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, onHomeApp = { manageHomeApp() }, + onHomeScreen = { on -> + HomeApp.setHomeScreenEnabled(this, on) + refreshHomeAppState() + }, onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) @@ -401,7 +407,8 @@ class MainActivity : ComponentActivity() { } private fun refreshHomeAppState() { - homeAppSelected = HomeApp.isDefault(this) + homeScreenEnabled = HomeApp.isHomeScreenEnabled(this) + homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() } 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 0d355d5d93..5c73281b7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -157,6 +157,7 @@ class FrontEndState( val pageKey: String? = null, val theme: String = Themes.PAPER, val isHomeApp: Boolean = false, + val homeScreenEnabled: Boolean = false, val defaultHomeLabel: String? = null, val androidApps: List = emptyList(), val secondScreenDisplays: List = emptyList(), @@ -195,6 +196,7 @@ class FrontEndActions( val onPageBack: () -> Unit = {}, val onTheme: (String) -> Unit = {}, val onHomeApp: () -> Unit = {}, + val onHomeScreen: (Boolean) -> Unit = {}, val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, val onBackActionsInverted: (Boolean) -> Unit = {}, val onCheckLatestBuild: () -> Unit = {}, @@ -972,7 +974,14 @@ private fun SetupPanel(s: FrontEndState, a: FrontEndActions) { } } } - ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) + ToggleRow( + host, "home-screen", "Use as a Home screen", + if (s.homeScreenEnabled) "DroidDeck can be the phone's Home app" else "Off: DroidDeck is never offered as a Home app", + s.homeScreenEnabled, + ) { a.onHomeScreen(it) } + if (s.homeScreenEnabled) { + ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) + } } } }