mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
fix(dual-screen): docked handhelds switch to single-screen mode (#2232)
* fix(dual-screen): docked handhelds switch to single-screen mode With Dual screen on Auto, a dual-screen handheld connected to a wired external display (dock, HDMI or USB-C monitor) no longer puts the menu, tabs or session controls on the built-in bottom screen, which nobody can see while it sits in a dock. The launcher and sessions use the single-screen layout on the main screen, which the external display mirrors. A bottom panel opened automatically closes once when the dock is connected and comes back after undocking. XR glasses, virtual and overlay displays and switched-off displays do not count as a dock, and Dual screen set to On keeps the bottom screen. * fix(dual-screen): only an automatic bottom panel closes on docking, and glasses are told apart from the dock display * fix(dual-screen): keep the automatic-panel state across activity recreation and reconcile docking before settling the panel
This commit is contained in:
1 parent
d74575ed7f
commit
2476c824f6
4 files changed
+113
-2
No files matched your search
@@ -676,6 +676,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM)))
|
||||
SessionState.secondScreenAutoOpened = false
|
||||
SessionState.secondScreenProvisional = false
|
||||
SessionState.secondScreenAutomatic = false
|
||||
SessionState.gameOnBottom = false
|
||||
gameOnBottom = false
|
||||
}
|
||||
@@ -1378,6 +1379,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
onSecondScreenMode = { mode ->
|
||||
if (docked) drawerOpen = false
|
||||
typingReturnMode = null
|
||||
automaticPanel = false
|
||||
if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this@SessionActivity, desktopSession, mode.id)
|
||||
selectSecondScreenMode(mode)
|
||||
},
|
||||
@@ -3248,6 +3250,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
return true
|
||||
}
|
||||
|
||||
private var dockedToDisplay = false
|
||||
private var automaticPanel: Boolean
|
||||
get() = SessionState.secondScreenAutomatic
|
||||
set(value) { SessionState.secondScreenAutomatic = value }
|
||||
|
||||
private val shownOnDisplayId: Int get() =
|
||||
if (Build.VERSION.SDK_INT >= 30) display?.displayId ?: windowManager.defaultDisplay.displayId
|
||||
else windowManager.defaultDisplay.displayId
|
||||
@@ -3259,6 +3266,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
.filter { glassesScreen == null || it.id != glasses.displayId }
|
||||
val oldIds = secondScreenDisplays.map { it.id }.toSet()
|
||||
secondScreenDisplays = candidates
|
||||
reconcileDock(primaryId)
|
||||
bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null
|
||||
val newIds = candidates.map { it.id }.toSet()
|
||||
if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) {
|
||||
@@ -3275,6 +3283,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
updateKeyboardRoute()
|
||||
}
|
||||
|
||||
private fun reconcileDock(primaryId: Int) {
|
||||
val nowDocked = com.droiddeck.launcher.input.DualScreen.dockedToDisplay(displayManager, primaryId)
|
||||
val automaticOnBuiltIn = automaticPanel && secondScreenMode != SecondScreenMode.NONE &&
|
||||
displayManager.getDisplay(selectedSecondScreenDisplay)?.let(com.droiddeck.launcher.input.DualScreen::builtIn) == true
|
||||
if (com.droiddeck.launcher.input.DualScreen.leavesBottomOnDock(dockedToDisplay, nowDocked, SessionPrefs.dualScreenSessionMode(this), automaticOnBuiltIn)) {
|
||||
closeSecondScreen(reset = true)
|
||||
SessionState.secondScreenAutoOpened = false
|
||||
}
|
||||
dockedToDisplay = nowDocked
|
||||
}
|
||||
|
||||
private fun openDualScreenControls() {
|
||||
if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return
|
||||
if (!SessionPrefs.dualScreenSessionControls(this)) return
|
||||
@@ -3283,6 +3302,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
SessionState.secondScreenAutoOpened = true
|
||||
selectedSecondScreenDisplay = target.displayId
|
||||
selectSecondScreenMode(openingPanel())
|
||||
automaticPanel = secondScreenMode != SecondScreenMode.NONE
|
||||
dualControlsProvisional = ::loading.isInitialized && loading.visible
|
||||
}
|
||||
|
||||
@@ -3697,7 +3717,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (focused && started) com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId)
|
||||
else com.droiddeck.launcher.ui.SessionTyping.close()
|
||||
updateKeyboardRoute()
|
||||
if (reset) panelMode(SecondScreenMode.NONE)
|
||||
if (reset) {
|
||||
panelMode(SecondScreenMode.NONE)
|
||||
automaticPanel = false
|
||||
}
|
||||
}
|
||||
|
||||
private fun panelMode(mode: SecondScreenMode) {
|
||||
@@ -4484,6 +4507,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) {
|
||||
contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver)
|
||||
}
|
||||
reconcileDock(shownOnDisplayId)
|
||||
settleDualScreenControls()
|
||||
refreshSecondScreenDisplays()
|
||||
if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode)
|
||||
|
||||
Reference in new issue
Block a user