diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 01f34a7852..5e9d133255 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1576,7 +1576,10 @@ class FrontEndActivity : ComponentActivity() { override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) - if (hasFocus) applyLauncherFullscreen() + if (hasFocus) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + applyLauncherFullscreen() + } } private fun applyLauncherFullscreen() { @@ -1635,7 +1638,7 @@ class FrontEndActivity : ComponentActivity() { override fun onPause() { compatLaunchVisible = false - if (android.os.Build.VERSION.SDK_INT >= 29) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, true) + if (android.os.Build.VERSION.SDK_INT >= 29) com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, true) super.onPause() } @@ -1643,6 +1646,7 @@ class FrontEndActivity : ComponentActivity() { super.onResume() compatLaunchVisible = true com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, false) orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 9d0ae53c1c..8c3555a817 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -148,7 +148,15 @@ object HomeApp { }.getOrNull() fun startShortcut(context: Context, info: ShortcutInfo) { - context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null) + val task = generateSequence(context) { (it as? android.content.ContextWrapper)?.baseContext } + .filterIsInstance().firstOrNull()?.taskId + task?.let { com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(it, true) } + try { + context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null) + } catch (e: Exception) { + task?.let { com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(it, false) } + throw e + } } fun openAppInfo(context: Context, app: LaunchableApp) { 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 348ad43ff6..f53da2eb36 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -70,6 +70,7 @@ object DualScreenPanel { set(value) { field = value; available = value || activity != null } private var ownerTask = -1 private var ownerYielded = false + private var ownerPaused = false var typing by mutableStateOf(null) private set @@ -120,6 +121,7 @@ object DualScreenPanel { displayId = display ownerTask = task ownerYielded = false + ownerPaused = false launching = true val intent = Intent(context, DualScreenActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) @@ -153,15 +155,27 @@ object DualScreenPanel { if (ownerTask == task) ownerYielded = app } - internal fun returnFocus(context: Context) { - if (ownerYielded) return - val task = ownerTask.takeIf { it >= 0 } ?: return + fun ownerPaused(task: Int, paused: Boolean) { + if (ownerTask == task) ownerPaused = paused + } + + internal fun focusTask(fromPanel: Boolean): Int? { + if (ownerYielded || (ownerPaused && !fromPanel)) return null + 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) { - if (ownerYielded) return - val task = ownerTask.takeIf { it >= 0 } ?: return + val task = focusTask(false) ?: return val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager runCatching { manager.appTasks.firstOrNull { @@ -209,10 +223,10 @@ class DualScreenActivity : ComponentActivity() { runCatching { (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(taskId, 0) } } else { unfocusPending = true - DualScreenPanel.returnFocus(this) + DualScreenPanel.returnFocus(this, fromPanel = true) window.decorView.postDelayed({ if (!unfocusPending || DualScreenPanel.typingShown) return@postDelayed - if (window.decorView.hasWindowFocus()) DualScreenPanel.returnFocus(this) else dropFocus() + if (window.decorView.hasWindowFocus()) DualScreenPanel.returnFocus(this, fromPanel = true) else dropFocus() }, 400) } } @@ -228,9 +242,24 @@ class DualScreenActivity : ComponentActivity() { if (!DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this) } + private var topResumed = false + private var fresh = true + private var touchedAt = Long.MIN_VALUE + override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { super.onTopResumedActivityChanged(isTopResumedActivity) - if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this) + topResumed = isTopResumedActivity + val took = DualScreenPanel.tookFocus(fresh, touchedAt, android.os.SystemClock.uptimeMillis()) + fresh = false + if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = took) + } + + 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) + } + return super.dispatchTouchEvent(event) } override fun onWindowFocusChanged(hasFocus: Boolean) { @@ -251,6 +280,7 @@ class DualScreenActivity : ComponentActivity() { if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping() return true } + if (topResumed && !DualScreenPanel.typingShown && event.action == KeyEvent.ACTION_DOWN) DualScreenPanel.returnFocus(this, fromPanel = true) return super.dispatchKeyEvent(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 010c66cabd..02074f144f 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -2,6 +2,9 @@ package com.droiddeck.launcher.ui import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -29,4 +32,46 @@ class DualScreenPanelOwnerTest { DualScreenPanel.hide(10) assertEquals(-1, DualScreenPanel.shownOn) } + + @Test fun aPausedLauncherIsOnlyBroughtBackWhenThePanelTookFocusItself() { + DualScreenPanel.show(app, 2, 10) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = false)) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } + + @Test fun anAppTheLauncherOpenedKeepsItsScreenEvenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun anotherTasksPauseDoesNotStopThePanelReturningFocus() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.ownerPaused(11, true) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } + + @Test fun aNewPanelForgetsThatTheLastLauncherWasPaused() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.ownerPaused(10, true) + DualScreenPanel.hide() + 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)) + } }