mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
fix(dual-screen): bring back the trackpad and Deck panels on the second screen (#2229)
Keyboard + trackpad and Deck grips + trackpads are second-screen panels again, rendering the stock layouts without changing the input profile. The last panel is remembered separately for desktop and game sessions; desktop sessions start on the trackpad. A Deck panel without the Deck pad falls back to the default. Stock panels left Steam blue return to the neutral look once.
This commit is contained in:
1 parent
ffb76240fd
commit
b474cba79e
11 files changed
+169
-163
No files matched your search
@@ -520,4 +520,17 @@ class InputLibraryTest {
|
||||
assertNull(InputLibraries.read(context).layouts.single { it.id == "mine" }.style.tint)
|
||||
assertEquals(InputLibraries.read(context), InputLibraries.read(context))
|
||||
}
|
||||
|
||||
@Test fun versionTenStockPanelsReturnToGrayOnce() {
|
||||
val fresh = InputLibraries.read(context)
|
||||
val blue = fresh.layouts.filter { it.id == InputLibraries.DECK || it.id == InputLibraries.TRACKPAD }
|
||||
.map { it.copy(style = it.style.copy(tint = ControllerPrefs.STEAM_BLUE)) }
|
||||
val old = JSONObject(InputLibraries.encode(blue.fold(fresh) { library, layout -> library.withLayout(layout) })).put("version", 10)
|
||||
prefs.edit().putString("library", old.toString()).commit()
|
||||
val upgraded = InputLibraries.read(context)
|
||||
assertNull(upgraded.layouts.single { it.id == InputLibraries.DECK }.style.tint)
|
||||
assertNull(upgraded.layouts.single { it.id == InputLibraries.TRACKPAD }.style.tint)
|
||||
assertEquals(ControllerPrefs.STEAM_BLUE, upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.style.tint)
|
||||
assertEquals(upgraded, InputLibraries.read(context))
|
||||
}
|
||||
}
|
||||
@@ -46,13 +46,22 @@ class SecondScreenModeTest {
|
||||
}
|
||||
|
||||
@Test fun theDesktopOpensAgainOnlyWhileItCanRun() {
|
||||
assertEquals(SecondScreenMode.DESKTOP, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true, desktop = true))
|
||||
assertEquals(SecondScreenMode.DESKTOP, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true, bottomDesktop = true))
|
||||
assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true))
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("desktop", deckPad = false))
|
||||
}
|
||||
|
||||
@Test fun withNothingRememberedTheDesktopIsNeverPicked() {
|
||||
assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true, desktop = true))
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false, desktop = true))
|
||||
assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true, bottomDesktop = true))
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false, bottomDesktop = true))
|
||||
}
|
||||
|
||||
@Test fun desktopSessionsOpenTheTrackpadUntilTheUserPicksAnotherPanel() {
|
||||
for (deckPad in listOf(false, true)) for (dashboard in listOf(false, true)) {
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad, dashboard, desktopSession = true))
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("gone", deckPad, dashboard, desktopSession = true))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.opening("custom-controls", deckPad, dashboard, desktopSession = true))
|
||||
assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad, dashboard, desktopSession = true))
|
||||
}
|
||||
}
|
||||
}
|
||||
+73
-91
@@ -1,6 +1,7 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.hardware.display.DisplayManager
|
||||
import android.view.Display
|
||||
import androidx.compose.runtime.MutableState
|
||||
@@ -8,7 +9,6 @@ import com.droiddeck.launcher.SessionActivity
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
import com.droiddeck.launcher.session.SessionService
|
||||
import com.droiddeck.launcher.session.SessionState
|
||||
import org.json.JSONObject
|
||||
import org.junit.After
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Before
|
||||
@@ -27,6 +27,7 @@ class SecondScreenProfileMigrationTest {
|
||||
private val previousMode = SessionState.mode
|
||||
private val previousPanel = SessionState.secondScreenMode
|
||||
private val previousDisplay = SessionState.secondScreenDisplay
|
||||
private val previousDeckPad = SessionState.deckPad
|
||||
|
||||
@Before fun setUp() {
|
||||
SessionState.secondScreenMode = SecondScreenMode.NONE
|
||||
@@ -44,110 +45,78 @@ class SecondScreenProfileMigrationTest {
|
||||
SessionState.mode = previousMode
|
||||
SessionState.secondScreenMode = previousPanel
|
||||
SessionState.secondScreenDisplay = previousDisplay
|
||||
SessionState.deckPad = previousDeckPad
|
||||
}
|
||||
|
||||
@Test fun automaticOpeningKeepsCustomLayoutsAndBindingsInBothSessionModes() {
|
||||
@Test fun firstOpeningKeepsTheLibraryAndOpensTheTrackpadOnDesktopAndTheControllerPanelInGames() {
|
||||
for (desktop in listOf(false, true)) for (deckPad in listOf(false, true)) {
|
||||
val original = customLibrary(desktop)
|
||||
open(null, deckPad)
|
||||
open(desktop, deckPad)
|
||||
assertEquals(original, InputLibraries.read(activity))
|
||||
assertNull(SessionPrefs.secondScreenPanel(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SessionState.secondScreenMode)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun unavailableOrUnknownPanelsDoNotReplaceCustomControls() {
|
||||
for (remembered in listOf("none", "gone", "dashboard", "desktop")) for (deckPad in listOf(false, true)) {
|
||||
val original = customLibrary(desktop = false)
|
||||
SessionPrefs.setSecondScreenPanel(activity, remembered)
|
||||
open(remembered, deckPad)
|
||||
assertEquals(original, InputLibraries.read(activity))
|
||||
assertEquals(remembered, SessionPrefs.secondScreenPanel(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SessionState.secondScreenMode)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun explicitlySavedLegacyPanelsStillMigrateOnlyTheCurrentMode() {
|
||||
for (desktop in listOf(false, true)) for (legacy in listOf(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.KEYBOARD_TRACKPAD)) {
|
||||
val original = customLibrary(desktop)
|
||||
SessionPrefs.setSecondScreenPanel(activity, legacy.id)
|
||||
open(legacy.id, deckPad = true)
|
||||
val preset = if (legacy == SecondScreenMode.DECK_CONTROLS) InputStockLayouts.DECK else InputStockLayouts.TRACKPAD
|
||||
val expected = original.selectPart(desktop, InputRole.SECONDARY, preset)
|
||||
assertEquals(expected, InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
open(SessionPrefs.secondScreenPanel(activity), deckPad = true)
|
||||
assertEquals(expected, InputLibraries.read(activity))
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun legacyPanelsDoNotReplaceAnExistingQuickSelection() {
|
||||
customLibrary(desktop = true)
|
||||
val original = InputLibraries.update(activity) { it.selectPart(true, InputRole.SECONDARY, "custom.bindings") }
|
||||
SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.DECK_CONTROLS.id)
|
||||
open(SecondScreenMode.DECK_CONTROLS.id, deckPad = true)
|
||||
assertEquals(original, InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
}
|
||||
|
||||
@Test fun unrelatedPartSelectionsDoNotSkipTheSavedPanelMigration() {
|
||||
for (desktop in listOf(false, true)) for (role in listOf(InputRole.PHYSICAL, InputRole.PRIMARY)) {
|
||||
customLibrary(desktop)
|
||||
val original = InputLibraries.update(activity) { it.selectPart(desktop, role, it.profile("game").binding(role)) }
|
||||
SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.KEYBOARD_TRACKPAD.id)
|
||||
open(SecondScreenMode.KEYBOARD_TRACKPAD.id, deckPad = true)
|
||||
assertEquals(original.selectPart(desktop, InputRole.SECONDARY, InputStockLayouts.TRACKPAD), InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun explicitProfilesIncludingAutoKeepTheirSecondaryLayoutAfterOtherPartChanges() {
|
||||
for (desktop in listOf(false, true)) for (profile in listOf(InputProfiles.AUTO, InputProfile.GAME, InputProfile.DESKTOP)) {
|
||||
for (role in listOf(null, InputRole.PHYSICAL, InputRole.PRIMARY)) {
|
||||
customLibrary(desktop)
|
||||
val original = InputLibraries.update(activity) { library ->
|
||||
val selected = library.selectProfile(desktop, profile)
|
||||
if (role == null) selected else selected.selectPart(desktop, role, selected.profile("game").binding(role))
|
||||
}
|
||||
SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.DECK_CONTROLS.id)
|
||||
open(SecondScreenMode.DECK_CONTROLS.id, deckPad = true)
|
||||
assertEquals(original, InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
assertNull(SessionPrefs.secondScreenPanel(activity, desktop))
|
||||
val dashboard = ReflectionHelpers.callInstanceMethod<List<*>>(activity, "bottomPages").isNotEmpty()
|
||||
val expected = when {
|
||||
desktop -> SecondScreenMode.KEYBOARD_TRACKPAD
|
||||
deckPad -> SecondScreenMode.DECK_CONTROLS
|
||||
dashboard -> SecondScreenMode.DASHBOARD
|
||||
else -> SecondScreenMode.KEYBOARD_TRACKPAD
|
||||
}
|
||||
assertEquals(expected, SessionState.secondScreenMode)
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun unavailableDeckPanelKeepsItsSavedChoiceUntilItCanMigrate() {
|
||||
for (desktop in listOf(false, true)) {
|
||||
@Test fun desktopAndGamesEachReopenTheirOwnLastPanel() {
|
||||
customLibrary(desktop = false)
|
||||
SessionPrefs.setSecondScreenPanel(activity, true, SecondScreenMode.TERMINAL.id)
|
||||
SessionPrefs.setSecondScreenPanel(activity, false, SecondScreenMode.CUSTOM_CONTROLS.id)
|
||||
open(desktop = true, deckPad = true)
|
||||
assertEquals(SecondScreenMode.TERMINAL, SessionState.secondScreenMode)
|
||||
open(desktop = false, deckPad = true)
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS, SessionState.secondScreenMode)
|
||||
}
|
||||
|
||||
@Test fun theSharedPanelChoiceCarriesOverToGamesExceptTheForcedProfileControls() {
|
||||
val prefs = activity.getSharedPreferences("session", Context.MODE_PRIVATE)
|
||||
prefs.edit().putString("secondScreenPanel", SecondScreenMode.TERMINAL.id).commit()
|
||||
assertEquals(SecondScreenMode.TERMINAL.id, SessionPrefs.secondScreenPanel(activity, false))
|
||||
assertNull(SessionPrefs.secondScreenPanel(activity, true))
|
||||
customLibrary(desktop = true)
|
||||
open(desktop = true, deckPad = true)
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SessionState.secondScreenMode)
|
||||
prefs.edit().putString("secondScreenPanel", SecondScreenMode.CUSTOM_CONTROLS.id).commit()
|
||||
for (desktop in listOf(false, true)) assertNull(SessionPrefs.secondScreenPanel(activity, desktop))
|
||||
}
|
||||
|
||||
@Test fun trackpadAndDeckPanelsUseTheirStockBindingsWithoutChangingTheProfile() {
|
||||
for (desktop in listOf(false, true)) for (mode in listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.DECK_CONTROLS)) {
|
||||
val original = customLibrary(desktop)
|
||||
SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.DECK_CONTROLS.id)
|
||||
open(SecondScreenMode.DECK_CONTROLS.id, deckPad = false)
|
||||
SessionState.deckPad = true
|
||||
val stock = original.preset(mode.bindings!!)
|
||||
show(mode)
|
||||
assertEquals(original, InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.DECK_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
open(SessionPrefs.secondScreenPanel(activity), deckPad = true)
|
||||
assertEquals(original.selectPart(desktop, InputRole.SECONDARY, InputStockLayouts.DECK), InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
assertEquals(stock.layoutId, routedLayout()?.id)
|
||||
assertEquals(stock.elements, routedProfile().elements[InputRole.SECONDARY].orEmpty())
|
||||
show(SecondScreenMode.CUSTOM_CONTROLS)
|
||||
assertEquals("custom.layout", routedLayout()?.id)
|
||||
assertEquals(InputAction.Keys(listOf(57)), routedProfile().elementAction(InputRole.SECONDARY, "custom.button", InputControl.A))
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun failedMigrationKeepsTheSavedPanelAndCanBeRetried() {
|
||||
val original = customLibrary(desktop = false)
|
||||
val prefs = activity.getSharedPreferences("input-profiles", Context.MODE_PRIVATE)
|
||||
val valid = prefs.getString("library", null)!!
|
||||
val unsupported = JSONObject(valid).put("version", 999).toString()
|
||||
prefs.edit().putString("library", unsupported).commit()
|
||||
SessionPrefs.setSecondScreenPanel(activity, SecondScreenMode.KEYBOARD_TRACKPAD.id)
|
||||
open(SecondScreenMode.KEYBOARD_TRACKPAD.id, deckPad = true)
|
||||
assertEquals(unsupported, prefs.getString("library", null))
|
||||
assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD.id, SessionPrefs.secondScreenPanel(activity))
|
||||
prefs.edit().putString("library", valid).commit()
|
||||
open(SessionPrefs.secondScreenPanel(activity), deckPad = true)
|
||||
assertEquals(original.selectPart(false, InputRole.SECONDARY, InputStockLayouts.TRACKPAD), InputLibraries.read(activity))
|
||||
assertEquals(SecondScreenMode.CUSTOM_CONTROLS.id, SessionPrefs.secondScreenPanel(activity))
|
||||
@Test fun aDeckPanelLeftOverWithoutTheDeckPadOpensTheFallbackInstead() {
|
||||
for (desktop in listOf(false, true)) {
|
||||
customLibrary(desktop)
|
||||
SessionState.deckPad = false
|
||||
show(SecondScreenMode.DECK_CONTROLS)
|
||||
val fallback = ReflectionHelpers.callInstanceMethod<SecondScreenMode>(activity, "openingPanel")
|
||||
assertNotEquals(SecondScreenMode.DECK_CONTROLS, fallback)
|
||||
if (desktop) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, fallback)
|
||||
assertEquals(fallback, SessionState.secondScreenMode)
|
||||
assertNotEquals(InputLibraries.DECK, routedLayout()?.id)
|
||||
}
|
||||
}
|
||||
|
||||
private fun customLibrary(desktop: Boolean): InputLibrary {
|
||||
SessionState.mode = if (desktop) SessionService.MODE_DESKTOP else SessionService.MODE_STEAM
|
||||
session(desktop)
|
||||
return InputLibraries.update(activity) { library ->
|
||||
val id = if (desktop) InputProfile.DESKTOP else InputProfile.GAME
|
||||
val element = InputSurfaceElement(InputControl.A, .3f, .2f, .2f, .2f, "custom.button")
|
||||
@@ -161,8 +130,21 @@ class SecondScreenProfileMigrationTest {
|
||||
}
|
||||
}
|
||||
|
||||
private fun open(remembered: String?, deckPad: Boolean) {
|
||||
val mode = SecondScreenMode.opening(remembered, deckPad)
|
||||
ReflectionHelpers.callInstanceMethod<Unit>(activity, "showSecondScreen", ReflectionHelpers.ClassParameter.from(SecondScreenMode::class.java, mode))
|
||||
private fun routedProfile(): InputProfile = ReflectionHelpers.getField(activity, "inputProfile")
|
||||
|
||||
private fun routedLayout(): SavedInputLayout? = ReflectionHelpers.getField<MutableState<SavedInputLayout?>>(activity, "secondaryInputLayout\$delegate").value
|
||||
|
||||
private fun session(desktop: Boolean) {
|
||||
SessionState.mode = if (desktop) SessionService.MODE_DESKTOP else SessionService.MODE_STEAM
|
||||
activity.intent = Intent().putExtra(SessionService.EXTRA_MODE, SessionState.mode)
|
||||
}
|
||||
|
||||
private fun open(desktop: Boolean, deckPad: Boolean) {
|
||||
session(desktop)
|
||||
SessionState.deckPad = deckPad
|
||||
show(ReflectionHelpers.callInstanceMethod<SecondScreenMode>(activity, "openingPanel"))
|
||||
}
|
||||
|
||||
private fun show(mode: SecondScreenMode) =
|
||||
ReflectionHelpers.callInstanceMethod<Unit>(activity, "showSecondScreen", ReflectionHelpers.ClassParameter.from(SecondScreenMode::class.java, mode))
|
||||
}
|
||||
@@ -354,7 +354,7 @@ class SessionSecondScreenTest {
|
||||
SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it })
|
||||
}
|
||||
}
|
||||
val modes = listOf(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL)
|
||||
val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL, SecondScreenMode.CUSTOM_CONTROLS)
|
||||
for (mode in modes) {
|
||||
compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick()
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user