From ac132a23e2a1c9179a1e10bc2098ea4fb9d5f0c9 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 09:21:49 -0400 Subject: [PATCH] fix: dual-screen update prompt survives a bottom-screen tap, home launcher stays out of Recents, Quest panel opens landscape (#1893) * fix: dual-screen launcher keeps the update prompt on screen and stays out of Recents as home; Quest panel opens landscape Outside screens the launcher opens (the update prompt, Settings, pickers) now hold the top screen when the bottom screen is touched, so a bottom-screen tap no longer buries the Android install prompt and leaves updates stuck waiting for confirmation (DD-368). When DroidDeck is the home app its launcher task is excluded from Recents, so it can no longer be swiped closed; a running game session is still listed (DD-377). The launcher declares a 1024x640 dp default panel size so Meta Quest opens it landscape again after the orientation manifest change in #1606 (DD-360). * fix: Recents exclusion follows the top DroidDeck activity and only undoes its own change The launcher task is hidden from Recents only while FrontEndActivity is on top, DroidDeck is home and no session runs; the file manager and a running session show it again, the check repeats when the launcher pauses, and tasks hidden by someone else are left alone. * fix: Recents ownership survives process death and never claims a task someone else excluded --- app/src/main/AndroidManifest.xml | 1 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 16 +++++++ .../java/com/droiddeck/launcher/HomeApp.kt | 46 +++++++++++++++++++ .../droiddeck/launcher/ui/DualScreenPanel.kt | 2 + .../com/droiddeck/launcher/HomeRecentsTest.kt | 22 +++++++++ .../launcher/ui/DualScreenPanelOwnerTest.kt | 16 +++++++ 7 files changed, 104 insertions(+) create mode 100644 app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3040ee33be..1dbfcd5b3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -105,6 +105,7 @@ android:exported="true" android:screenOrientation="user" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density|keyboard|keyboardHidden|navigation"> + diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 03946f444e..6700bd5d99 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -18,6 +18,7 @@ class App : Application() { super.onCreate() com.droiddeck.launcher.ui.Themes.loadGradient(this) com.droiddeck.launcher.ui.BuildWatermark.install(this) + HomeApp.trackRecents(this) // Helper processes must not initialize the main USB provider or guest graphics context. val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 5e9d133255..e60d00785f 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1574,6 +1574,22 @@ class FrontEndActivity : ComponentActivity() { startSession(Intent(this, SessionActivity::class.java).putExtra(SessionActivity.EXTRA_STEAMVR, steamVr), steamSession = true) } + @Suppress("OVERRIDE_DEPRECATION") + override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { + val outside = com.droiddeck.launcher.ui.DualScreenPanel.shownOn >= 0 && + com.droiddeck.launcher.ui.DualScreenPanel.opensOutside(packageName, intent.component?.packageName ?: intent.`package` ?: intent.resolveActivity(packageManager)?.packageName) + if (outside) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, true) + window.decorView.postDelayed({ if (hasWindowFocus()) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) }, 1500) + } + try { + super.startActivityForResult(intent, requestCode, options) + } catch (e: RuntimeException) { + if (outside) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + throw e + } + } + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) if (hasFocus) { diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 8c3555a817..ad72c38d63 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -147,6 +147,52 @@ object HomeApp { .getShortcutIconDrawable(info, context.resources.displayMetrics.densityDpi)?.toBitmap(px, px) }.getOrNull() + fun trackRecents(app: android.app.Application) { + app.registerActivityLifecycleCallbacks(object : android.app.Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: android.app.Activity, savedInstanceState: android.os.Bundle?) = Unit + override fun onActivityStarted(activity: android.app.Activity) = Unit + override fun onActivityResumed(activity: android.app.Activity) = syncRecents(activity) + override fun onActivityPaused(activity: android.app.Activity) { if (activity is FrontEndActivity) syncRecents(activity) } + override fun onActivityStopped(activity: android.app.Activity) = Unit + override fun onActivitySaveInstanceState(activity: android.app.Activity, outState: android.os.Bundle) = Unit + override fun onActivityDestroyed(activity: android.app.Activity) = Unit + }) + } + + private fun syncRecents(activity: android.app.Activity) = + keepOutOfRecents(activity, activity is FrontEndActivity && !SessionState.running && isDefault(activity)) + + internal enum class RecentsStep { HIDE, SHOW, FORGET, NONE } + + internal fun recentsStep(hidden: Boolean, owned: Boolean, excluded: Boolean): RecentsStep = when { + hidden && !excluded -> RecentsStep.HIDE + !hidden && owned && excluded -> RecentsStep.SHOW + !hidden && owned -> RecentsStep.FORGET + else -> RecentsStep.NONE + } + + fun keepOutOfRecents(activity: android.app.Activity, hidden: Boolean) { + val prefs = activity.getSharedPreferences("home-recents", Context.MODE_PRIVATE) + val owned = prefs.getStringSet("tasks", null).orEmpty() + val id = activity.taskId.toString() + if (!hidden && id !in owned) return + runCatching { + @Suppress("DEPRECATION") + fun idOf(task: android.app.ActivityManager.AppTask) = + if (Build.VERSION.SDK_INT >= 29) task.taskInfo.taskId else task.taskInfo.persistentId + val tasks = activity.getSystemService(android.app.ActivityManager::class.java).appTasks + val task = tasks.firstOrNull { idOf(it) == activity.taskId } ?: return + val excluded = task.taskInfo.baseIntent.flags and Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS != 0 + val step = recentsStep(hidden, id in owned, excluded) + if (step == RecentsStep.NONE) return + if (step != RecentsStep.FORGET) task.setExcludeFromRecents(step == RecentsStep.HIDE) + val live = tasks.map { idOf(it).toString() }.toSet() + val next = owned.filter { it in live && it != id }.toMutableSet() + if (step == RecentsStep.HIDE) next += id + prefs.edit().putStringSet("tasks", next).apply() + } + } + fun startShortcut(context: Context, info: ShortcutInfo) { val task = generateSequence(context) { (it as? android.content.ContextWrapper)?.baseContext } .filterIsInstance().firstOrNull()?.taskId diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index f53da2eb36..d7ff118e50 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -155,6 +155,8 @@ object DualScreenPanel { if (ownerTask == task) ownerYielded = app } + fun opensOutside(own: String, target: String?): Boolean = target != null && target != own + fun ownerPaused(task: Int, paused: Boolean) { if (ownerTask == task) ownerPaused = paused } diff --git a/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt new file mode 100644 index 0000000000..b45761eb9a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher + +import com.droiddeck.launcher.HomeApp.RecentsStep +import org.junit.Assert.assertEquals +import org.junit.Test + +class HomeRecentsTest { + @Test fun theLauncherHidesAVisibleTaskAndTakesItOver() { + assertEquals(RecentsStep.HIDE, HomeApp.recentsStep(hidden = true, owned = false, excluded = false)) + } + + @Test fun aTaskSomeoneElseExcludedIsNeverClaimedOrShown() { + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = false, excluded = true)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = false, owned = false, excluded = true)) + } + + @Test fun onlyATaskTheLauncherHidItselfIsShownAgain() { + assertEquals(RecentsStep.SHOW, HomeApp.recentsStep(hidden = false, owned = true, excluded = true)) + assertEquals(RecentsStep.FORGET, HomeApp.recentsStep(hidden = false, owned = true, excluded = false)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = true, excluded = true)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt index 02074f144f..9a59bc1ad6 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -52,6 +52,22 @@ class DualScreenPanelOwnerTest { assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) } + @Test fun aScreenFromAnotherAppKeepsTheTopScreenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + assertTrue(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.android.packageinstaller")) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun droidDecksOwnScreensAndUnresolvedIntentsDoNotYield() { + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.droiddeck.launcher")) + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", null)) + } + @Test fun anotherTasksPauseDoesNotStopThePanelReturningFocus() { DualScreenPanel.show(app, 2, 10) DualScreenPanel.ownerPaused(11, true)