From bfa61b5139407bb3969e0d6dae991e03829029eb Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 20:40:57 -0400 Subject: [PATCH] fix: "DroidDeck isn't responding" on dual-screen handhelds after the bottom screen sits idle (#1917) The bottom-screen panel handed focus back to the main screen only when it opened or was touched within the last second. When the panel became the active screen later, the paused launcher kept no focused window, so controller input waited until Android reported the app as not responding. The panel now hands focus back whenever it becomes the active screen or gains window focus, unless bottom-screen typing is open or an app the launcher opened is in front. --- .../droiddeck/launcher/ui/DualScreenPanel.kt | 18 ++++-------------- .../launcher/ui/DualScreenPanelOwnerTest.kt | 9 --------- 2 files changed, 4 insertions(+), 23 deletions(-) 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 d7ff118e50..6169815d40 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -166,18 +166,13 @@ object DualScreenPanel { return ownerTask.takeIf { it >= 0 } } - internal fun tookFocus(fresh: Boolean, touchedAt: Long, now: Long): Boolean = - fresh || now - touchedAt in 0..TOUCH_FOCUS_MS - - private const val TOUCH_FOCUS_MS = 1000L - internal fun returnFocus(context: Context, fromPanel: Boolean = false) { val task = focusTask(fromPanel) ?: return runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(task, 0) } } internal fun reclaimFocus(context: Context) { - val task = focusTask(false) ?: return + val task = focusTask(true) ?: return val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager runCatching { manager.appTasks.firstOrNull { @@ -245,21 +240,16 @@ class DualScreenActivity : ComponentActivity() { } private var topResumed = false - private var fresh = true - private var touchedAt = Long.MIN_VALUE override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { super.onTopResumedActivityChanged(isTopResumedActivity) topResumed = isTopResumedActivity - val took = DualScreenPanel.tookFocus(fresh, touchedAt, android.os.SystemClock.uptimeMillis()) - fresh = false - if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = took) + if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = true) } override fun dispatchTouchEvent(event: android.view.MotionEvent): Boolean { - if (event.actionMasked == android.view.MotionEvent.ACTION_DOWN) { - touchedAt = event.downTime - if (topResumed && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = true) + if (event.actionMasked == android.view.MotionEvent.ACTION_DOWN && topResumed && !DualScreenPanel.typingShown) { + DualScreenPanel.returnFocus(this, fromPanel = true) } return super.dispatchTouchEvent(event) } 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 9a59bc1ad6..016a932c1a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -81,13 +81,4 @@ class DualScreenPanelOwnerTest { DualScreenPanel.show(app, 2, 10) assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) } - - @Test fun thePanelTookFocusWhenItJustOpenedOrWasJustTouched() { - assertTrue(DualScreenPanel.tookFocus(fresh = true, touchedAt = Long.MIN_VALUE, now = 5_000L)) - assertTrue(DualScreenPanel.tookFocus(fresh = false, touchedAt = 4_700L, now = 5_000L)) - assertTrue(DualScreenPanel.tookFocus(fresh = false, touchedAt = 5_000L, now = 5_000L)) - assertFalse(DualScreenPanel.tookFocus(fresh = false, touchedAt = 3_500L, now = 5_000L)) - assertFalse(DualScreenPanel.tookFocus(fresh = false, touchedAt = Long.MIN_VALUE, now = 5_000L)) - assertFalse(DualScreenPanel.tookFocus(fresh = false, touchedAt = 6_000L, now = 5_000L)) - } }