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:
MaxsTechReview authored and GitHub committed 2026-11-07 15:48:17 -05:00
1 parent d74575ed7f
commit 2476c824f6
4 files changed
+113 -2

No files matched your search

@@ -12,7 +12,10 @@ import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.Shadows.shadowOf
import org.robolectric.annotation.Config
import org.robolectric.shadows.ShadowDisplayManager
import org.robolectric.util.ReflectionHelpers
@RunWith(RobolectricTestRunner::class)
@Config(manifest = Config.NONE)
@@ -51,6 +54,75 @@ class DualScreenTest {
assertTrue(DualScreen.hasOwnTouchPanel(main, null, listOf(1920 to 1080)))
}
@Test @Config(sdk = [34]) fun aWiredExternalDisplayDocksTheDevice() {
withDisplay(EXTERNAL, "HDMI Screen") { assertTrue(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
assertFalse(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY))
}
@Test @Config(sdk = [34]) fun glassesVirtualOverlayAndSwitchedOffDisplaysDoNotDock() {
withDisplay(EXTERNAL, "VITURE Luma Ultra") { assertFalse(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
withDisplay(VIRTUAL, "Screen recording") { assertFalse(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
withDisplay(OVERLAY, "Overlay #1") { assertFalse(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
withDisplay(EXTERNAL, "HDMI Screen") { display ->
shadowOf(display).setState(Display.STATE_OFF)
assertFalse(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY))
}
}
@Test @Config(sdk = [34]) fun dockingLeavesTheBuiltInPanelWhenDualScreenIsForcedOn() {
withDisplay(INTERNAL, "Bottom screen") { bottom ->
withDisplay(EXTERNAL, "HDMI Screen") {
assertTrue(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY))
assertEquals(bottom.displayId, DualScreen.display(context, displays, Display.DEFAULT_DISPLAY, DualScreen.MODE_ON)?.displayId)
assertNull(DualScreen.display(context, displays, Display.DEFAULT_DISPLAY, DualScreen.MODE_AUTO))
assertNull(DualScreen.display(context, displays, Display.DEFAULT_DISPLAY, DualScreen.MODE_OFF))
}
}
}
@Test @Config(sdk = [34]) fun glassesOnUsbDoNotHideAnUnnamedDockDisplay() {
val state = ReflectionHelpers.getField<kotlinx.coroutines.flow.MutableStateFlow<com.droiddeck.launcher.glasses.GlassesState>>(
com.droiddeck.launcher.glasses.Glasses, "_state")
val before = state.value
try {
state.value = before.copy(present = true)
withDisplay(EXTERNAL, "") { assertFalse(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
withDisplay(EXTERNAL, "VITURE Luma Ultra") {
withDisplay(EXTERNAL, "") { assertTrue(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
}
withDisplay(EXTERNAL, "") { glasses ->
state.value = before.copy(present = true, displayId = glasses.displayId)
withDisplay(EXTERNAL, "") { assertTrue(DualScreen.dockedToDisplay(displays, Display.DEFAULT_DISPLAY)) }
}
} finally { state.value = before }
}
@Test fun onlyTheMomentOfDockingClosesAnAutomaticBottomPanel() {
assertTrue(DualScreen.leavesBottomOnDock(wasDocked = false, docked = true, DualScreen.MODE_AUTO, automaticOnBuiltIn = true))
assertFalse(DualScreen.leavesBottomOnDock(wasDocked = true, docked = true, DualScreen.MODE_AUTO, automaticOnBuiltIn = true))
assertFalse(DualScreen.leavesBottomOnDock(wasDocked = false, docked = false, DualScreen.MODE_AUTO, automaticOnBuiltIn = true))
assertFalse(DualScreen.leavesBottomOnDock(wasDocked = false, docked = true, DualScreen.MODE_AUTO, automaticOnBuiltIn = false))
assertFalse(DualScreen.leavesBottomOnDock(wasDocked = false, docked = true, DualScreen.MODE_ON, automaticOnBuiltIn = true))
assertFalse(DualScreen.leavesBottomOnDock(wasDocked = false, docked = true, DualScreen.MODE_OFF, automaticOnBuiltIn = true))
}
private companion object {
const val INTERNAL = 1
const val EXTERNAL = 2
const val OVERLAY = 4
const val VIRTUAL = 5
}
private fun withDisplay(type: Int, name: String, check: (Display) -> Unit) {
val id = ShadowDisplayManager.addDisplay("w640dp-h480dp", type)
try {
val display = displays.getDisplay(id)
shadowOf(display).setFlags(Display.FLAG_PRESENTATION)
shadowOf(display).setName(name)
check(display)
} finally { ShadowDisplayManager.removeDisplay(id) }
}
@Test fun oneScreenDevicesGetNoSecondScreenInAnyMode() {
for (mode in DualScreen.modes) {
SessionPrefs.setDualScreenMode(context, mode)