diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index d31fc101d..be228331c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1028,7 +1028,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde kotlinx.coroutines.delay(2000) } } - pip = com.droiddeck.launcher.session.SessionPipController(this, ::pipBounds, ::showPipUi) + pip = com.droiddeck.launcher.session.SessionPipController(this, ::pipBounds, ::showPipUi) { + intent.getBooleanExtra(EXTRA_RETURN_HOME, false) + } surfaceView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> pip.refresh() } pip.refresh() handleHomeGuideIntent(intent) @@ -5705,6 +5707,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (this.intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) intent.putExtra(EXTRA_RETURN_HOME, true) if (!intent.hasExtra(EXTRA_LINK_TASK)) intent.putExtra(EXTRA_LINK_TASK, this.intent.getIntExtra(EXTRA_LINK_TASK, -1)) setIntent(intent) + if (::pip.isInitialized) pip.refresh(true) if (intent.getBooleanExtra(EXTRA_STEAMVR, false) && SessionState.mode == SessionService.MODE_STEAM) { SessionState.steamVr = true steamVrAutoTried = false diff --git a/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt b/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt index d2d4d49bd..cef3489a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PipPolicy.kt @@ -5,6 +5,11 @@ object PipPolicy { running && frameSeen && phase in setOf(SessionPhase.READY, SessionPhase.SUSPENDED) && (!automatic || !suspended) + // A front end or shortcut that launched the game brings it back by moving its task to the + // front, which Android ignores for a task in picture in picture, and draws its resume controls + // where the picture would sit. Going home suspends the game for it instead. + fun autoEnter(enabled: Boolean, launchedByAnotherApp: Boolean): Boolean = enabled && !launchedByAnotherApp + fun aspect(width: Int, height: Int): Pair = when { width <= 0 || height <= 0 -> 16 to 9 width.toDouble() / height > 2.39 -> 239 to 100 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt index f32fe2abb..503b8c743 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPipController.kt @@ -16,6 +16,7 @@ class SessionPipController( private val activity: SessionActivity, private val bounds: () -> Rect, private val showPipUi: (Boolean) -> Unit, + private val launchedByAnotherApp: () -> Boolean = { false }, ) { var transitioning = false private set @@ -29,7 +30,8 @@ class SessionPipController( PipPolicy.eligible(SessionState.running, SessionState.firstFrameSeen, SessionState.phase, SessionState.suspended, automatic) - fun automatic() = !suppressAuto && SessionPrefs.pipAutoEnter(activity) && eligible(true) + fun automatic() = !suppressAuto && PipPolicy.autoEnter(SessionPrefs.pipAutoEnter(activity), launchedByAnotherApp()) && + eligible(true) fun refresh(force: Boolean = false) { if (!supported(activity)) return diff --git a/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt index 1261abd54..ad4f169c4 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PipPolicyTest.kt @@ -18,6 +18,12 @@ class PipPolicyTest { assertFalse(PipPolicy.eligible(true, false, SessionPhase.SUSPENDED, true, false)) } + @Test fun goingHomeFloatsOnlyGamesDroidDeckLaunchedItself() { + assertTrue(PipPolicy.autoEnter(enabled = true, launchedByAnotherApp = false)) + assertFalse(PipPolicy.autoEnter(enabled = true, launchedByAnotherApp = true)) + assertFalse(PipPolicy.autoEnter(enabled = false, launchedByAnotherApp = false)) + } + @Test fun aspectRatiosStayWithinAndroidLimitsWithoutChangingNormalContent() { assertEquals(1920 to 1080, PipPolicy.aspect(1920, 1080)) assertEquals(239 to 100, PipPolicy.aspect(5760, 1080))