diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 0356f96998..9bc5170130 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3316,16 +3316,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun showSecondScreen(requested: SecondScreenMode) { if (pipUi || !started) return val mode = if (requested == SecondScreenMode.DECK_CONTROLS || requested == SecondScreenMode.KEYBOARD_TRACKPAD) { - val desktop = SessionState.mode == SessionService.MODE_DESKTOP - val library = com.droiddeck.launcher.input.InputLibraries.read(this) - val key = if (desktop) InputProfile.DESKTOP else InputProfile.GAME - if (key !in library.selections) { - val preset = if (requested == SecondScreenMode.DECK_CONTROLS) com.droiddeck.launcher.input.InputStockLayouts.DECK else com.droiddeck.launcher.input.InputStockLayouts.TRACKPAD - runCatching { com.droiddeck.launcher.input.InputLibraries.update(this) { it.selectPart(desktop, InputRole.SECONDARY, preset) } } - .onSuccess { refreshInputProfile() } - .onFailure { Log.w(TAG, "could not migrate the saved second-screen selection", it) } + val remembered = SessionPrefs.secondScreenPanel(this) + if (remembered == SecondScreenMode.DECK_CONTROLS.id || remembered == SecondScreenMode.KEYBOARD_TRACKPAD.id) { + val desktop = SessionState.mode == SessionService.MODE_DESKTOP + val library = com.droiddeck.launcher.input.InputLibraries.read(this) + val key = if (desktop) InputProfile.DESKTOP else InputProfile.GAME + if (key !in library.selections) { + val preset = if (requested == SecondScreenMode.DECK_CONTROLS) com.droiddeck.launcher.input.InputStockLayouts.DECK else com.droiddeck.launcher.input.InputStockLayouts.TRACKPAD + runCatching { com.droiddeck.launcher.input.InputLibraries.update(this) { it.selectPart(desktop, InputRole.SECONDARY, preset) } } + .onSuccess { refreshInputProfile() } + .onFailure { Log.w(TAG, "could not migrate the saved second-screen selection", it) } + } + SessionPrefs.setSecondScreenPanel(this, SecondScreenMode.CUSTOM_CONTROLS.id) } - SessionPrefs.setSecondScreenPanel(this, SecondScreenMode.CUSTOM_CONTROLS.id) SecondScreenMode.CUSTOM_CONTROLS } else requested val target = displayManager.getDisplay(selectedSecondScreenDisplay) diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt new file mode 100644 index 0000000000..485b55c46d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenProfileMigrationTest.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.input + +import android.hardware.display.DisplayManager +import android.view.Display +import androidx.compose.runtime.MutableState +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.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], shadows = [SessionInputPointerTest.WriterShadow::class]) +class SecondScreenProfileMigrationTest { + private lateinit var activity: SessionActivity + private val previousMode = SessionState.mode + private val previousPanel = SessionState.secondScreenMode + private val previousDisplay = SessionState.secondScreenDisplay + + @Before fun setUp() { + SessionState.secondScreenMode = SecondScreenMode.NONE + activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val displays = activity.getSystemService(DisplayManager::class.java) + shadowOf(displays.getDisplay(Display.DEFAULT_DISPLAY)).setFlags(Display.FLAG_PRESENTATION) + ReflectionHelpers.setField(activity, "displayManager", displays) + ReflectionHelpers.setField(activity, "started", true) + val display: MutableState = ReflectionHelpers.getField(activity, "selectedSecondScreenDisplay\$delegate") + display.value = Display.DEFAULT_DISPLAY + } + + @After fun tearDown() { + ReflectionHelpers.callInstanceMethod(activity, "closeSecondScreen", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + SessionState.mode = previousMode + SessionState.secondScreenMode = previousPanel + SessionState.secondScreenDisplay = previousDisplay + } + + @Test fun automaticOpeningKeepsCustomLayoutsAndBindingsInBothSessionModes() { + for (desktop in listOf(false, true)) for (deckPad in listOf(false, true)) { + val original = customLibrary(desktop) + open(null, 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)) + } + + private fun customLibrary(desktop: Boolean): InputLibrary { + SessionState.mode = if (desktop) SessionService.MODE_DESKTOP else SessionService.MODE_STEAM + 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") + val layout = SavedInputLayout("custom.layout", "Custom controls", listOf(element), screen = InputLayoutScreen.SECONDARY) + val bindings = SavedInputBindings("custom.bindings", "Custom actions", false, layout.id, + elements = mapOf(element.id to InputAction.Keys(listOf(57)))) + val profile = library.profile(id) + library.withLayout(layout).withPreset(bindings) + .withProfile(profile.copy(parts = profile.parts + (InputRole.SECONDARY to InputPart(bindings.id, layout.id)))) + .copy(selections = emptyMap()) + } + } + + private fun open(remembered: String?, deckPad: Boolean) { + val mode = SecondScreenMode.opening(remembered, deckPad) + ReflectionHelpers.callInstanceMethod(activity, "showSecondScreen", ReflectionHelpers.ClassParameter.from(SecondScreenMode::class.java, mode)) + } +}