mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
Use the second screen on dual-screen handhelds (#1734)
* Use the second screen on dual-screen handhelds Detect built-in second screens such as the Retroid Pocket Duo and AYN Thor. The sections move to a menu on the bottom screen, L2 and R2 switch sections, and text fields type on the bottom screen so the top keeps the full view. Sessions open the bottom-screen trackpad and keyboard when they start. Setup gains a Dual screen choice (Automatic, On, Off) with toggles for the bottom menu and the in-game controls. Closing the bottom menu no longer ends a running session. * Type into Steam from the bottom screen While the bottom-screen trackpad and keyboard controls are open in a Steam session, Steam's own on-screen keyboard no longer covers the top screen. The agent keeps Steam's text target and asks the app instead, which opens the Android keyboard on the bottom screen and hands focus back to the game when it closes. Modal and VR keyboards, and sessions without the bottom controls, keep Steam's keyboard. The Show keyboard button now follows the keyboard when it is closed another way. * Open the bottom controls after the first frame and tidy dual-screen translations * Move the in-game menu to the bottom screen on dual-screen handhelds Fix controller input and focus on the second screen: keys and sticks reach the game after touching the bottom controls, closing the bottom controls returns focus to the game, B closes bottom typing, and the typing panel keeps a focusable window until focus has left it. * Let B close the open layer of the session menu first and focus the selected bottom-screen mode * Let the Retroid Pocket Duo Home double press open its quick menu during sessions * Open the keyboard on the bottom screen for Steam text fields and hide it on Enter or when the field loses focus * Keep controller focus on the top screen when a section is picked on the bottom screen * Keep LB and RB on the store tabs and let Back return from a store to its tab * Show the Adreno 722 as supported on the Retroid Pocket Duo * Label the Steam integration suggestion's close button Close and cover that closing it is permanent * Close the docked menu with its presentation, keep a focus picked during the stop delay, and ignore panel picks on process-settings pages
This commit is contained in:
1 parent
e9e0186e66
commit
283e3b4549
65 files changed
+2425
-350
No files matched your search
@@ -11,6 +11,7 @@
|
||||
</intent>
|
||||
</queries>
|
||||
|
||||
<uses-permission android:name="android.permission.REORDER_TASKS" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
@@ -243,6 +244,26 @@
|
||||
android:resizeableActivity="true"
|
||||
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" />
|
||||
|
||||
<activity
|
||||
android:name=".ui.DualScreenActivity"
|
||||
android:exported="false"
|
||||
android:excludeFromRecents="true"
|
||||
android:taskAffinity="${applicationId}.dualscreen"
|
||||
android:theme="@style/SessionTheme"
|
||||
android:resizeableActivity="true"
|
||||
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" />
|
||||
|
||||
<activity
|
||||
android:name=".ui.SessionTypingActivity"
|
||||
android:exported="false"
|
||||
android:excludeFromRecents="true"
|
||||
android:noHistory="true"
|
||||
android:taskAffinity="${applicationId}.typing"
|
||||
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
|
||||
android:resizeableActivity="true"
|
||||
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
|
||||
android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" />
|
||||
|
||||
<activity
|
||||
android:name=".gpu.SteamVrRestartActivity"
|
||||
android:exported="false"
|
||||
|
||||
@@ -525,6 +525,12 @@ class FrontEndActivity : ComponentActivity() {
|
||||
}
|
||||
}
|
||||
private var secondScreenDisplays by mutableStateOf<List<SecondScreenDisplay>>(emptyList())
|
||||
private var dualDisplayId by mutableStateOf(-1)
|
||||
private var dualScreenDevice by mutableStateOf(false)
|
||||
private var dualScreenMode by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO)
|
||||
private var dualScreenLauncher by mutableStateOf(true)
|
||||
private var dualScreenControls by mutableStateOf(true)
|
||||
private var launcherStarted = false
|
||||
private lateinit var displayManager: DisplayManager
|
||||
private val secondScreenDisplayListener = object : DisplayManager.DisplayListener {
|
||||
override fun onDisplayAdded(displayId: Int) = refreshSecondScreenDisplays()
|
||||
@@ -1017,6 +1023,11 @@ class FrontEndActivity : ComponentActivity() {
|
||||
integrationFocus = integrationFocus,
|
||||
androidApps = androidApps,
|
||||
secondScreenDisplays = secondScreenDisplays,
|
||||
dualScreen = dualDisplayId >= 0 && com.droiddeck.launcher.ui.DualScreenPanel.available,
|
||||
dualScreenDevice = dualScreenDevice,
|
||||
dualScreenMode = dualScreenMode,
|
||||
dualScreenLauncher = dualScreenLauncher,
|
||||
dualScreenControls = dualScreenControls,
|
||||
packages = packageRows,
|
||||
packageCatalogLoading = catalogLoading,
|
||||
packageBusyId = pkgId,
|
||||
@@ -1245,6 +1256,18 @@ class FrontEndActivity : ComponentActivity() {
|
||||
onStoresSort = { sort -> SessionPrefs.setStoresSort(this, sort); storesSort = sort },
|
||||
onStoresView = { view -> SessionPrefs.setStoresView(this, view); storesView = view },
|
||||
onLibraryChanged = { refreshAddedGames(); refresh() },
|
||||
onDualScreenMode = { mode ->
|
||||
SessionPrefs.setDualScreenMode(this, mode)
|
||||
refreshSecondScreenDisplays()
|
||||
},
|
||||
onDualScreenLauncher = { on ->
|
||||
SessionPrefs.setDualScreenLauncher(this, on)
|
||||
refreshSecondScreenDisplays()
|
||||
},
|
||||
onDualScreenControls = { on ->
|
||||
SessionPrefs.setDualScreenSessionControls(this, on)
|
||||
dualScreenControls = on
|
||||
},
|
||||
onAnimationsEnabled = { on ->
|
||||
SessionPrefs.setAnimationsEnabled(this, on)
|
||||
animationsEnabled = on
|
||||
@@ -1621,6 +1644,7 @@ class FrontEndActivity : ComponentActivity() {
|
||||
addDataScheme("file")
|
||||
})
|
||||
displayManager.registerDisplayListener(secondScreenDisplayListener, ui)
|
||||
launcherStarted = true
|
||||
refreshSecondScreenDisplays()
|
||||
getSystemService(android.content.pm.LauncherApps::class.java).registerCallback(packageCallback, ui)
|
||||
HomeWidgets.startListening(this)
|
||||
@@ -1663,6 +1687,8 @@ class FrontEndActivity : ComponentActivity() {
|
||||
com.droiddeck.launcher.stores.StoresState.libraryListener = null
|
||||
com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null
|
||||
displayManager.unregisterDisplayListener(secondScreenDisplayListener)
|
||||
launcherStarted = false
|
||||
com.droiddeck.launcher.ui.DualScreenPanel.hide()
|
||||
flood = null
|
||||
returning = null
|
||||
floodProgress = 0f
|
||||
@@ -1696,7 +1722,20 @@ class FrontEndActivity : ComponentActivity() {
|
||||
if (!::displayManager.isInitialized) return
|
||||
// The launcher can itself be shown on a non-default display (DeX, an external monitor); that one is not a "second screen".
|
||||
val ownDisplayId = if (android.os.Build.VERSION.SDK_INT >= 30) display?.displayId ?: android.view.Display.DEFAULT_DISPLAY else @Suppress("DEPRECATION") windowManager.defaultDisplay.displayId
|
||||
secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId)
|
||||
dualScreenMode = SessionPrefs.dualScreenMode(this)
|
||||
secondScreenDisplays = if (dualScreenMode == com.droiddeck.launcher.input.DualScreen.MODE_OFF) emptyList()
|
||||
else SecondScreenDisplays.available(displayManager, ownDisplayId)
|
||||
dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null
|
||||
dualScreenLauncher = SessionPrefs.dualScreenLauncher(this)
|
||||
dualScreenControls = SessionPrefs.dualScreenSessionControls(this)
|
||||
val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId)
|
||||
dualDisplayId = if (dualScreenLauncher) target?.displayId ?: -1 else -1
|
||||
syncDualPanel()
|
||||
}
|
||||
|
||||
private fun syncDualPanel() {
|
||||
if (launcherStarted && dualDisplayId >= 0) com.droiddeck.launcher.ui.DualScreenPanel.show(this, dualDisplayId, taskId)
|
||||
else com.droiddeck.launcher.ui.DualScreenPanel.hide()
|
||||
}
|
||||
|
||||
private fun launchAndroidApp(app: HomeApp.LaunchableApp, displayId: Int?) {
|
||||
|
||||
@@ -294,7 +294,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
private val resumeKeysDown = mutableSetOf<Pair<Int, Int>>()
|
||||
private val drawerShortcutKeysDown = mutableSetOf<Pair<Int, Int>>()
|
||||
|
||||
private var drawerOpen by mutableStateOf(false)
|
||||
private var drawerOpenState by mutableStateOf(false)
|
||||
private var typingReturnMode: SecondScreenMode? = null
|
||||
private var drawerDocked by mutableStateOf(false)
|
||||
private var drawerLayerOpen = false
|
||||
private var drawerBackRequests by mutableIntStateOf(0)
|
||||
private var drawerOpen: Boolean
|
||||
get() = drawerOpenState
|
||||
set(value) {
|
||||
if (value == drawerOpenState) return
|
||||
drawerLayerOpen = false
|
||||
if (value) drawerDocked = dockDrawer() && openDockedMenu()
|
||||
drawerOpenState = value
|
||||
if (!value && drawerDocked) closeDockedMenu()
|
||||
}
|
||||
private var quitFrom by mutableStateOf<androidx.compose.ui.geometry.Rect?>(null)
|
||||
private var quitFlooded = false
|
||||
private var leaving by mutableStateOf(false)
|
||||
@@ -732,6 +745,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() }
|
||||
androidx.compose.runtime.LaunchedEffect(pipUi) { hud.setHidden(pipUi) }
|
||||
androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() }
|
||||
val keyboardRequestsSeen = androidx.compose.runtime.remember { intArrayOf(AgentGuest.keyboardRequests) }
|
||||
androidx.compose.runtime.LaunchedEffect(AgentGuest.keyboardRequests) {
|
||||
if (AgentGuest.keyboardRequests != keyboardRequestsSeen[0]) {
|
||||
keyboardRequestsSeen[0] = AgentGuest.keyboardRequests
|
||||
openBottomKeyboard()
|
||||
}
|
||||
}
|
||||
val keyboardDismissalsSeen = androidx.compose.runtime.remember { intArrayOf(AgentGuest.keyboardDismissals) }
|
||||
androidx.compose.runtime.LaunchedEffect(AgentGuest.keyboardDismissals) {
|
||||
if (AgentGuest.keyboardDismissals != keyboardDismissalsSeen[0]) {
|
||||
keyboardDismissalsSeen[0] = AgentGuest.keyboardDismissals
|
||||
secondScreenPresentation?.closeFieldKeyboard()
|
||||
}
|
||||
}
|
||||
androidx.compose.runtime.LaunchedEffect(picturePosition, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() }
|
||||
DroidDeckTheme {
|
||||
if (pipUi) {
|
||||
@@ -896,8 +923,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
syncLossless()
|
||||
releasePads()
|
||||
androidx.compose.runtime.withFrameNanos { }
|
||||
val requested = sessionOverlay.requestFocus()
|
||||
Log.i(TAG, "drawer root focus requested=$requested focused=${sessionOverlay.hasFocus()}")
|
||||
val requested = focusDrawer()
|
||||
Log.i(TAG, "drawer root focus requested=$requested docked=$drawerDocked")
|
||||
} else {
|
||||
releaseDrawerDirection()
|
||||
}
|
||||
@@ -935,236 +962,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
onAndroidKeyboard = { pcKeyboardOpen = false; keyboard?.toggle() },
|
||||
onClose = { pcKeyboardOpen = false },
|
||||
)
|
||||
SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions(
|
||||
steam = SessionState.mode == SessionService.MODE_STEAM,
|
||||
direct = noSteamSession(),
|
||||
title = if (SessionState.mode == SessionService.MODE_RUN)
|
||||
com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_title_game) else null,
|
||||
isHomeApp = isHomeApp,
|
||||
androidApps = androidApps,
|
||||
hudOn = hudOn,
|
||||
hudConfig = hudConfig,
|
||||
upscaler = upscaler, upscaleSharpness = upscaleSharpness,
|
||||
effects = effects,
|
||||
cardboard = cardboard,
|
||||
cardboardSensor = hasRotationSensor,
|
||||
onCardboard = { c -> SessionPrefs.setCardboard(this@SessionActivity, c); applyCardboard(c) },
|
||||
onCardboardRecenter = { headTracker?.recenter() },
|
||||
glassesPresent = glasses.present,
|
||||
glassesOutput = glassesOutputActive,
|
||||
onGlassesRecenter = {
|
||||
headTracker?.recenter()
|
||||
com.droiddeck.launcher.glasses.GlassesMenuMirror.recenter()
|
||||
},
|
||||
steamVr = steamVrStatus,
|
||||
immersiveSteamVr = com.droiddeck.launcher.session.QuestExperimental.isSupported(),
|
||||
onSteamVr = { action -> steamVrAction(action) },
|
||||
textureAnisotropy = if (drawerGameProfileId == null) textureAnisotropy else drawerTextureAnisotropy,
|
||||
textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias,
|
||||
frameGen = frameGen,
|
||||
lossless = lossless,
|
||||
oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy,
|
||||
steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode,
|
||||
micAvailable = SessionState.micAvailable && !SessionState.suspended,
|
||||
micEnabled = SessionState.micEnabled,
|
||||
onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) },
|
||||
touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct),
|
||||
fexPreset = fexPreset,
|
||||
secondScreenMode = secondScreenMode,
|
||||
secondScreenDisplays = secondScreenDisplays,
|
||||
selectedSecondScreenDisplay = selectedSecondScreenDisplay,
|
||||
onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() },
|
||||
onHudSetting = { key, value -> hudConfig = FusionHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() },
|
||||
onHudReset = { hudConfig = FusionHudConfig.reset(this@SessionActivity); hud.applyConfig() },
|
||||
onHudExport = { exportHudDiagnostics() },
|
||||
onUpscaler = { m ->
|
||||
SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m
|
||||
WaylandCompositor.nativeSetUpscaler(m)
|
||||
WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name)
|
||||
},
|
||||
onUpscaleSharpness = { pct ->
|
||||
SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct
|
||||
WaylandCompositor.nativeSetUpscaleSharpness(pct)
|
||||
},
|
||||
onEffects = { e ->
|
||||
SessionPrefs.setScreenEffects(this@SessionActivity, e); effects = e
|
||||
e.push(upscaler)
|
||||
},
|
||||
onTextureAnisotropy = { value ->
|
||||
drawerGameProfileId?.let { appId ->
|
||||
SessionPrefs.setGameTextureAnisotropy(this@SessionActivity, appId.toString(), value)
|
||||
drawerTextureAnisotropy = value
|
||||
} ?: value?.let {
|
||||
SessionPrefs.setTextureAnisotropy(this@SessionActivity, it)
|
||||
textureAnisotropy = it
|
||||
}
|
||||
},
|
||||
onTextureLodBias = { value ->
|
||||
drawerGameProfileId?.let { appId ->
|
||||
SessionPrefs.setGameTextureLodBias(this@SessionActivity, appId.toString(), value)
|
||||
drawerTextureLodBias = value
|
||||
} ?: value?.let {
|
||||
SessionPrefs.setTextureLodBias(this@SessionActivity, it)
|
||||
textureLodBias = it
|
||||
}
|
||||
},
|
||||
onFrameGenPick = { mode ->
|
||||
FrameGen.set(this@SessionActivity, mode)
|
||||
readPrefs()
|
||||
applyFrameGen()
|
||||
},
|
||||
onImportLossless = {
|
||||
pickLossless.launch(InAppFilePicker.buildIntent(
|
||||
this@SessionActivity, listOf("dll"), getString(R.string.lsfg_pick_title)))
|
||||
},
|
||||
onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; keyboard?.toggle() },
|
||||
onHardwareKeyboard = ::togglePcKeyboard,
|
||||
controller = controllerSettings,
|
||||
onRumble = { on -> updateControllerPrefs { ControllerPrefs.setRumble(this@SessionActivity, on) } },
|
||||
onSteamButton = { on -> updateControllerPrefs { ControllerPrefs.setSteamButton(this@SessionActivity, on) } },
|
||||
onQamButton = { on -> updateControllerPrefs { ControllerPrefs.setQamButton(this@SessionActivity, on) } },
|
||||
onKeyboardButton = { on -> updateControllerPrefs { ControllerPrefs.setKeyboardButton(this@SessionActivity, on) } },
|
||||
onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null,
|
||||
onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null,
|
||||
onAchievements = achievementsInFront?.let { { drawerOpen = false; achievementsOpen = true } },
|
||||
achievementsProgress = achievementsInFront?.progress,
|
||||
padType = if (SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad) padType else null,
|
||||
onPadType = { id ->
|
||||
SessionPrefs.setSteamController(this@SessionActivity, id)
|
||||
com.droiddeck.launcher.session.SteamDeckPad.showPad(SessionPrefs.padType(id))
|
||||
com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id))
|
||||
com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id))
|
||||
padType = id
|
||||
},
|
||||
backActionsInverted = backActionsInverted,
|
||||
backDoubleTapMs = backDoubleTapMs,
|
||||
onBackDoubleTapMs = { ms ->
|
||||
SessionPrefs.setBackDoubleTapMs(this@SessionActivity, ms)
|
||||
backDoubleTapMs = ms
|
||||
},
|
||||
onBackActionsInverted = { inverted ->
|
||||
SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted)
|
||||
backActionsInverted = inverted
|
||||
},
|
||||
lowLatency = lowLatency,
|
||||
onLowLatency = { on ->
|
||||
SessionPrefs.setLowLatency(this@SessionActivity, on)
|
||||
lowLatency = on
|
||||
applyLowLatency()
|
||||
},
|
||||
onOsc = { v ->
|
||||
SessionPrefs.setOscMode(this@SessionActivity, v)
|
||||
readPrefs()
|
||||
updateOnScreenControls()
|
||||
if (v == SessionPrefs.OSC_STEAM_TOUCH && com.droiddeck.launcher.input.SteamTouchDevice.current == null)
|
||||
Toast.makeText(this@SessionActivity, R.string.osc_style_next_session, Toast.LENGTH_LONG).show()
|
||||
},
|
||||
onEditSteamTouch = if (steamTouchAvailable && oscMode == SessionPrefs.OSC_STEAM_TOUCH && onScreenButtonsVisible) ({
|
||||
drawerOpen = false
|
||||
steamTouchControls?.startEditing()
|
||||
}) else null,
|
||||
onSuspendPolicy = { policy ->
|
||||
SessionPrefs.setSuspendPolicy(this@SessionActivity, SessionState.mode, policy)
|
||||
suspendPolicy = policy
|
||||
SessionService.suspendPolicyChanged(this@SessionActivity)
|
||||
},
|
||||
onSteamDownloadsInBackground = { enabled ->
|
||||
SessionPrefs.setSteamDownloadsInBackground(this@SessionActivity, enabled)
|
||||
steamDownloadsInBackground = enabled
|
||||
SessionService.suspendPolicyChanged(this@SessionActivity)
|
||||
},
|
||||
onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() },
|
||||
onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true },
|
||||
onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() },
|
||||
screenKeysShown = screenKeysShown,
|
||||
onScreenKeysShown = { shown ->
|
||||
screenKeysShown = shown
|
||||
com.droiddeck.launcher.input.ControllerPrefs.setScreenKeysShown(this@SessionActivity, shown)
|
||||
screenKeys?.stopEditing()
|
||||
screenKeys?.visibility = if (shown) View.VISIBLE else View.GONE
|
||||
},
|
||||
onScreenLayouts = {
|
||||
drawerOpen = false
|
||||
screenLayoutNames = layoutNames()
|
||||
screenLayoutsOpen = true
|
||||
},
|
||||
onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() },
|
||||
onSecondScreenMode = ::selectSecondScreenMode,
|
||||
onSecondScreenDisplay = ::selectSecondScreenDisplay,
|
||||
onLaunchAndroidApp = { app, displayId ->
|
||||
drawerOpen = false
|
||||
try {
|
||||
HomeApp.launch(this@SessionActivity, app, displayId)
|
||||
} catch (_: Exception) {
|
||||
val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label
|
||||
val message = when {
|
||||
displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label)
|
||||
label != null -> getString(R.string.android_app_open_failed_on, app.label, label)
|
||||
else -> getString(R.string.android_app_open_failed_display, app.label, displayId)
|
||||
}
|
||||
Toast.makeText(this@SessionActivity, message, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
},
|
||||
pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this@SessionActivity),
|
||||
pipAutoEnter = pipAutoEnter,
|
||||
onPip = { pip.enter() },
|
||||
onPause = ::pauseNow,
|
||||
onPipAutoEnter = { on ->
|
||||
SessionPrefs.setPipAutoEnter(this@SessionActivity, on)
|
||||
pipAutoEnter = on
|
||||
pip.refresh(true)
|
||||
},
|
||||
unfoldedControls = unfoldedControls,
|
||||
onUnfoldedControls = ::chooseUnfoldedControls,
|
||||
unfoldedControlsWithController = unfoldedControlsWithController,
|
||||
onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController,
|
||||
onBackground = { drawerOpen = false; pip.background(); moveTaskToBack(true) },
|
||||
onShareLogs = { drawerOpen = false; shareCurrentSessionLogs() },
|
||||
onStop = { drawerOpen = false; SessionService.stop(this@SessionActivity); finish() },
|
||||
onStopFrom = { onScreen ->
|
||||
drawerOpen = false
|
||||
if (onScreen == null || com.droiddeck.launcher.ui.Motion.scale == 0f || quitFrom != null) {
|
||||
if (quitFrom == null) { SessionService.stop(this@SessionActivity); finish() }
|
||||
} else {
|
||||
val at = IntArray(2).also { sessionOverlay.getLocationOnScreen(it) }
|
||||
quitFrom = onScreen.translate(-at[0].toFloat(), -at[1].toFloat())
|
||||
}
|
||||
},
|
||||
onClose = { drawerOpen = false },
|
||||
components = drawerComponents,
|
||||
onComponentsRefresh = {
|
||||
refreshDrawerComponents()
|
||||
drawerComponentMenu.refreshComponentCatalog(force = false)
|
||||
},
|
||||
componentCatalog = drawerComponentMenu.compCatalog,
|
||||
componentCatalogAt = drawerComponentMenu.compCatalogAt,
|
||||
componentCatalogChecking = drawerComponentMenu.compChecking,
|
||||
componentDownloads = drawerComponentMenu.compDownloads,
|
||||
componentDownloadRevision = drawerComponentMenu.compDownloadRevision,
|
||||
onComponentCatalogRefresh = { drawerComponentMenu.refreshComponentCatalog() },
|
||||
onComponentDownload = drawerComponentMenu::downloadComponent,
|
||||
gameProfiles = drawerGameProfileRefresh.data?.profiles.orEmpty(),
|
||||
selectedGameProfileId = drawerGameProfileId,
|
||||
selectedGameProfile = drawerGameProfileRefresh.data
|
||||
?.takeIf { it.selectedAppId == drawerGameProfileId }?.profile,
|
||||
gameProfilesLoaded = drawerGameProfileRefresh.loaded,
|
||||
gameProfileRefreshFailed = drawerGameProfileRefresh.failed,
|
||||
onSelectedGameProfile = ::selectDrawerGameProfile,
|
||||
onGameProfilesPageOpened = {
|
||||
drawerGameProfileFollowState.resumeFollowingSteam()
|
||||
drawerGameInventoryRevision++
|
||||
},
|
||||
onSelectedGameProfileRefresh = ::refreshDrawerGameProfile,
|
||||
gameFexPresetSaving = drawerGameFexPresetSaving,
|
||||
onGameFexPreset = ::setDrawerGameFexPreset,
|
||||
gameNoSteamSaving = drawerGameNoSteamSaving,
|
||||
onGameNoSteam = ::setDrawerGameNoSteam,
|
||||
onComponentSwap = { pid, comp, value -> swapDrawerComponent(pid, comp, value) },
|
||||
onGameComponent = ::setDrawerGameComponent,
|
||||
defaultProtonId = drawerDefaultProton,
|
||||
onDefaultProton = ::chooseDrawerDefaultProton,
|
||||
onGameProton = ::setDrawerGameProton,
|
||||
))
|
||||
if (!drawerDocked) SessionMenu(docked = false)
|
||||
LaunchedEffect(achievementsOpen) {
|
||||
if (achievementsOpen) {
|
||||
releasePads()
|
||||
@@ -1214,6 +1012,241 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
}
|
||||
|
||||
@androidx.compose.runtime.Composable
|
||||
private fun SessionMenu(docked: Boolean) {
|
||||
SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, docked = docked,
|
||||
backRequest = drawerBackRequests, onLayerChange = { drawerLayerOpen = it }, a = DrawerActions(
|
||||
steam = SessionState.mode == SessionService.MODE_STEAM,
|
||||
direct = noSteamSession(),
|
||||
title = if (SessionState.mode == SessionService.MODE_RUN)
|
||||
com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_title_game) else null,
|
||||
isHomeApp = isHomeApp,
|
||||
androidApps = androidApps,
|
||||
hudOn = hudOn,
|
||||
hudConfig = hudConfig,
|
||||
upscaler = upscaler, upscaleSharpness = upscaleSharpness,
|
||||
effects = effects,
|
||||
cardboard = cardboard,
|
||||
cardboardSensor = hasRotationSensor,
|
||||
onCardboard = { c -> SessionPrefs.setCardboard(this@SessionActivity, c); applyCardboard(c) },
|
||||
onCardboardRecenter = { headTracker?.recenter() },
|
||||
glassesPresent = glasses.present,
|
||||
glassesOutput = glassesOutputActive,
|
||||
onGlassesRecenter = {
|
||||
headTracker?.recenter()
|
||||
com.droiddeck.launcher.glasses.GlassesMenuMirror.recenter()
|
||||
},
|
||||
steamVr = steamVrStatus,
|
||||
immersiveSteamVr = com.droiddeck.launcher.session.QuestExperimental.isSupported(),
|
||||
onSteamVr = { action -> steamVrAction(action) },
|
||||
textureAnisotropy = if (drawerGameProfileId == null) textureAnisotropy else drawerTextureAnisotropy,
|
||||
textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias,
|
||||
frameGen = frameGen,
|
||||
lossless = lossless,
|
||||
oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy,
|
||||
steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode,
|
||||
micAvailable = SessionState.micAvailable && !SessionState.suspended,
|
||||
micEnabled = SessionState.micEnabled,
|
||||
onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) },
|
||||
touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct),
|
||||
fexPreset = fexPreset,
|
||||
secondScreenMode = secondScreenMode,
|
||||
secondScreenDisplays = secondScreenDisplays,
|
||||
selectedSecondScreenDisplay = selectedSecondScreenDisplay,
|
||||
onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() },
|
||||
onHudSetting = { key, value -> hudConfig = FusionHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() },
|
||||
onHudReset = { hudConfig = FusionHudConfig.reset(this@SessionActivity); hud.applyConfig() },
|
||||
onHudExport = { exportHudDiagnostics() },
|
||||
onUpscaler = { m ->
|
||||
SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m
|
||||
WaylandCompositor.nativeSetUpscaler(m)
|
||||
WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(effects, m)?.name)
|
||||
},
|
||||
onUpscaleSharpness = { pct ->
|
||||
SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct
|
||||
WaylandCompositor.nativeSetUpscaleSharpness(pct)
|
||||
},
|
||||
onEffects = { e ->
|
||||
SessionPrefs.setScreenEffects(this@SessionActivity, e); effects = e
|
||||
e.push(upscaler)
|
||||
},
|
||||
onTextureAnisotropy = { value ->
|
||||
drawerGameProfileId?.let { appId ->
|
||||
SessionPrefs.setGameTextureAnisotropy(this@SessionActivity, appId.toString(), value)
|
||||
drawerTextureAnisotropy = value
|
||||
} ?: value?.let {
|
||||
SessionPrefs.setTextureAnisotropy(this@SessionActivity, it)
|
||||
textureAnisotropy = it
|
||||
}
|
||||
},
|
||||
onTextureLodBias = { value ->
|
||||
drawerGameProfileId?.let { appId ->
|
||||
SessionPrefs.setGameTextureLodBias(this@SessionActivity, appId.toString(), value)
|
||||
drawerTextureLodBias = value
|
||||
} ?: value?.let {
|
||||
SessionPrefs.setTextureLodBias(this@SessionActivity, it)
|
||||
textureLodBias = it
|
||||
}
|
||||
},
|
||||
onFrameGenPick = { mode ->
|
||||
FrameGen.set(this@SessionActivity, mode)
|
||||
readPrefs()
|
||||
applyFrameGen()
|
||||
},
|
||||
onImportLossless = {
|
||||
pickLossless.launch(InAppFilePicker.buildIntent(
|
||||
this@SessionActivity, listOf("dll"), getString(R.string.lsfg_pick_title)))
|
||||
},
|
||||
onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; keyboard?.toggle() },
|
||||
onHardwareKeyboard = ::togglePcKeyboard,
|
||||
controller = controllerSettings,
|
||||
onRumble = { on -> updateControllerPrefs { ControllerPrefs.setRumble(this@SessionActivity, on) } },
|
||||
onSteamButton = { on -> updateControllerPrefs { ControllerPrefs.setSteamButton(this@SessionActivity, on) } },
|
||||
onQamButton = { on -> updateControllerPrefs { ControllerPrefs.setQamButton(this@SessionActivity, on) } },
|
||||
onKeyboardButton = { on -> updateControllerPrefs { ControllerPrefs.setKeyboardButton(this@SessionActivity, on) } },
|
||||
onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null,
|
||||
onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null,
|
||||
onAchievements = achievementsInFront?.let { { drawerOpen = false; achievementsOpen = true } },
|
||||
achievementsProgress = achievementsInFront?.progress,
|
||||
padType = if (SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad) padType else null,
|
||||
onPadType = { id ->
|
||||
SessionPrefs.setSteamController(this@SessionActivity, id)
|
||||
com.droiddeck.launcher.session.SteamDeckPad.showPad(SessionPrefs.padType(id))
|
||||
com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id))
|
||||
com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id))
|
||||
padType = id
|
||||
},
|
||||
backActionsInverted = backActionsInverted,
|
||||
backDoubleTapMs = backDoubleTapMs,
|
||||
onBackDoubleTapMs = { ms ->
|
||||
SessionPrefs.setBackDoubleTapMs(this@SessionActivity, ms)
|
||||
backDoubleTapMs = ms
|
||||
},
|
||||
onBackActionsInverted = { inverted ->
|
||||
SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted)
|
||||
backActionsInverted = inverted
|
||||
},
|
||||
lowLatency = lowLatency,
|
||||
onLowLatency = { on ->
|
||||
SessionPrefs.setLowLatency(this@SessionActivity, on)
|
||||
lowLatency = on
|
||||
applyLowLatency()
|
||||
},
|
||||
onOsc = { v ->
|
||||
SessionPrefs.setOscMode(this@SessionActivity, v)
|
||||
readPrefs()
|
||||
updateOnScreenControls()
|
||||
if (v == SessionPrefs.OSC_STEAM_TOUCH && com.droiddeck.launcher.input.SteamTouchDevice.current == null)
|
||||
Toast.makeText(this@SessionActivity, R.string.osc_style_next_session, Toast.LENGTH_LONG).show()
|
||||
},
|
||||
onEditSteamTouch = if (steamTouchAvailable && oscMode == SessionPrefs.OSC_STEAM_TOUCH && onScreenButtonsVisible) ({
|
||||
drawerOpen = false
|
||||
steamTouchControls?.startEditing()
|
||||
}) else null,
|
||||
onSuspendPolicy = { policy ->
|
||||
SessionPrefs.setSuspendPolicy(this@SessionActivity, SessionState.mode, policy)
|
||||
suspendPolicy = policy
|
||||
SessionService.suspendPolicyChanged(this@SessionActivity)
|
||||
},
|
||||
onSteamDownloadsInBackground = { enabled ->
|
||||
SessionPrefs.setSteamDownloadsInBackground(this@SessionActivity, enabled)
|
||||
steamDownloadsInBackground = enabled
|
||||
SessionService.suspendPolicyChanged(this@SessionActivity)
|
||||
},
|
||||
onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() },
|
||||
onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true },
|
||||
onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() },
|
||||
screenKeysShown = screenKeysShown,
|
||||
onScreenKeysShown = { shown ->
|
||||
screenKeysShown = shown
|
||||
com.droiddeck.launcher.input.ControllerPrefs.setScreenKeysShown(this@SessionActivity, shown)
|
||||
screenKeys?.stopEditing()
|
||||
screenKeys?.visibility = if (shown) View.VISIBLE else View.GONE
|
||||
},
|
||||
onScreenLayouts = {
|
||||
drawerOpen = false
|
||||
screenLayoutNames = layoutNames()
|
||||
screenLayoutsOpen = true
|
||||
},
|
||||
onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() },
|
||||
onSecondScreenMode = { mode -> if (docked) drawerOpen = false; typingReturnMode = null; selectSecondScreenMode(mode) },
|
||||
onSecondScreenDisplay = ::selectSecondScreenDisplay,
|
||||
onLaunchAndroidApp = { app, displayId ->
|
||||
drawerOpen = false
|
||||
try {
|
||||
HomeApp.launch(this@SessionActivity, app, displayId)
|
||||
} catch (_: Exception) {
|
||||
val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label
|
||||
val message = when {
|
||||
displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label)
|
||||
label != null -> getString(R.string.android_app_open_failed_on, app.label, label)
|
||||
else -> getString(R.string.android_app_open_failed_display, app.label, displayId)
|
||||
}
|
||||
Toast.makeText(this@SessionActivity, message, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
},
|
||||
pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this@SessionActivity),
|
||||
pipAutoEnter = pipAutoEnter,
|
||||
onPip = { pip.enter() },
|
||||
onPause = ::pauseNow,
|
||||
onPipAutoEnter = { on ->
|
||||
SessionPrefs.setPipAutoEnter(this@SessionActivity, on)
|
||||
pipAutoEnter = on
|
||||
pip.refresh(true)
|
||||
},
|
||||
unfoldedControls = unfoldedControls,
|
||||
onUnfoldedControls = ::chooseUnfoldedControls,
|
||||
unfoldedControlsWithController = unfoldedControlsWithController,
|
||||
onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController,
|
||||
onBackground = { drawerOpen = false; pip.background(); moveTaskToBack(true) },
|
||||
onShareLogs = { drawerOpen = false; shareCurrentSessionLogs() },
|
||||
onStop = { drawerOpen = false; SessionService.stop(this@SessionActivity); finish() },
|
||||
onStopFrom = { onScreen ->
|
||||
drawerOpen = false
|
||||
if (onScreen == null || com.droiddeck.launcher.ui.Motion.scale == 0f || quitFrom != null) {
|
||||
if (quitFrom == null) { SessionService.stop(this@SessionActivity); finish() }
|
||||
} else {
|
||||
val at = IntArray(2).also { sessionOverlay.getLocationOnScreen(it) }
|
||||
quitFrom = onScreen.translate(-at[0].toFloat(), -at[1].toFloat())
|
||||
}
|
||||
},
|
||||
onClose = { drawerOpen = false },
|
||||
components = drawerComponents,
|
||||
onComponentsRefresh = {
|
||||
refreshDrawerComponents()
|
||||
drawerComponentMenu.refreshComponentCatalog(force = false)
|
||||
},
|
||||
componentCatalog = drawerComponentMenu.compCatalog,
|
||||
componentCatalogAt = drawerComponentMenu.compCatalogAt,
|
||||
componentCatalogChecking = drawerComponentMenu.compChecking,
|
||||
componentDownloads = drawerComponentMenu.compDownloads,
|
||||
componentDownloadRevision = drawerComponentMenu.compDownloadRevision,
|
||||
onComponentCatalogRefresh = { drawerComponentMenu.refreshComponentCatalog() },
|
||||
onComponentDownload = drawerComponentMenu::downloadComponent,
|
||||
gameProfiles = drawerGameProfileRefresh.data?.profiles.orEmpty(),
|
||||
selectedGameProfileId = drawerGameProfileId,
|
||||
selectedGameProfile = drawerGameProfileRefresh.data
|
||||
?.takeIf { it.selectedAppId == drawerGameProfileId }?.profile,
|
||||
gameProfilesLoaded = drawerGameProfileRefresh.loaded,
|
||||
gameProfileRefreshFailed = drawerGameProfileRefresh.failed,
|
||||
onSelectedGameProfile = ::selectDrawerGameProfile,
|
||||
onGameProfilesPageOpened = {
|
||||
drawerGameProfileFollowState.resumeFollowingSteam()
|
||||
drawerGameInventoryRevision++
|
||||
},
|
||||
onSelectedGameProfileRefresh = ::refreshDrawerGameProfile,
|
||||
gameFexPresetSaving = drawerGameFexPresetSaving,
|
||||
onGameFexPreset = ::setDrawerGameFexPreset,
|
||||
gameNoSteamSaving = drawerGameNoSteamSaving,
|
||||
onGameNoSteam = ::setDrawerGameNoSteam,
|
||||
onComponentSwap = { pid, comp, value -> swapDrawerComponent(pid, comp, value) },
|
||||
onGameComponent = ::setDrawerGameComponent,
|
||||
defaultProtonId = drawerDefaultProton,
|
||||
onDefaultProton = ::chooseDrawerDefaultProton,
|
||||
onGameProton = ::setDrawerGameProton,
|
||||
))
|
||||
}
|
||||
|
||||
private fun refreshHomeApp() {
|
||||
isHomeApp = HomeApp.isDefault(this)
|
||||
androidApps = if (isHomeApp) HomeApp.launchableApps(this) else emptyList()
|
||||
@@ -2286,7 +2319,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (pad !== event) return dispatchKeyEvent(pad)
|
||||
val fromController = PadBridge.isControllerKeyEvent(event)
|
||||
if (fromController && event.action == KeyEvent.ACTION_DOWN) {
|
||||
if (drawerOpen && !drawerControllerActive) sessionOverlay.requestFocus()
|
||||
if (drawerOpen && !drawerControllerActive) focusDrawer()
|
||||
drawerControllerActive = true
|
||||
}
|
||||
if (fromController && event.keyCode == KeyEvent.KEYCODE_BUTTON_B && ::loading.isInitialized && loading.visible && !loading.ended && !drawerOpen) {
|
||||
@@ -2326,12 +2359,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
return true
|
||||
}
|
||||
val handled = super.dispatchKeyEvent(event)
|
||||
val handled = dispatchToDrawer(event)
|
||||
if (event.action == KeyEvent.ACTION_DOWN) {
|
||||
Log.i(TAG, "drawer key=${KeyEvent.keyCodeToString(event.keyCode)} handled=$handled viewFocused=${sessionOverlay.hasFocus()}")
|
||||
}
|
||||
if (event.keyCode == KeyEvent.KEYCODE_BUTTON_B || event.keyCode == KeyEvent.KEYCODE_BACK) {
|
||||
if (!handled && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) drawerOpen = false
|
||||
if (!handled && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
|
||||
if (drawerLayerOpen) drawerBackRequests++ else drawerOpen = false
|
||||
}
|
||||
releaseDrawerDirection()
|
||||
}
|
||||
return true
|
||||
@@ -2383,7 +2418,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
|
||||
if (pipUi) return true
|
||||
if (drawerOpen && PadBridge.isControllerMotionEvent(event)) {
|
||||
if (!drawerControllerActive) sessionOverlay.requestFocus()
|
||||
if (!drawerControllerActive) focusDrawer()
|
||||
drawerControllerActive = true
|
||||
if (event.actionMasked == MotionEvent.ACTION_MOVE &&
|
||||
event.isFromSource(InputDevice.SOURCE_JOYSTICK)
|
||||
@@ -2481,7 +2516,51 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (action == KeyEvent.ACTION_DOWN && repeatCount == 0) {
|
||||
Log.i(TAG, "drawer synthetic key=${KeyEvent.keyCodeToString(drawerDirectionKey)} viewFocused=${sessionOverlay.hasFocus()}")
|
||||
}
|
||||
super.dispatchKeyEvent(event)
|
||||
dispatchToDrawer(event)
|
||||
}
|
||||
|
||||
private fun dockedMenu(): SecondScreenPresentation? = secondScreenPresentation?.takeIf { drawerDocked && it.menuShown }
|
||||
|
||||
private fun dispatchToDrawer(event: KeyEvent): Boolean {
|
||||
val bottom = dockedMenu()
|
||||
if (bottom != null && event.keyCode != KeyEvent.KEYCODE_BACK) return bottom.dispatchMenuKey(event)
|
||||
return super.dispatchKeyEvent(event)
|
||||
}
|
||||
|
||||
private fun focusDrawer(): Boolean = dockedMenu()?.focusMenu() ?: sessionOverlay.requestFocus()
|
||||
|
||||
private fun dockDrawer(): Boolean {
|
||||
if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false
|
||||
if (!SessionPrefs.dualScreenLauncher(this)) return false
|
||||
val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false
|
||||
if (secondScreenDisplays.none { it.id == target.displayId }) return false
|
||||
val shown = secondScreenPresentation?.display?.displayId
|
||||
return shown == null || shown == target.displayId
|
||||
}
|
||||
|
||||
private fun openDockedMenu(): Boolean {
|
||||
val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false
|
||||
return try {
|
||||
val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also {
|
||||
selectedSecondScreenDisplay = target.displayId
|
||||
secondScreenPresentation = it
|
||||
}
|
||||
if (!presentation.isShowing) presentation.show()
|
||||
presentation.showMenu(true)
|
||||
updateKeyboardRoute()
|
||||
presentation.menuShown
|
||||
} catch (e: Exception) {
|
||||
Log.w(TAG, "could not open the menu on ${target.name}", e)
|
||||
if (secondScreenMode == SecondScreenMode.NONE) closeSecondScreen(reset = false)
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
private fun closeDockedMenu() {
|
||||
drawerDocked = false
|
||||
val presentation = secondScreenPresentation ?: return
|
||||
presentation.showMenu(false)
|
||||
if (secondScreenMode == SecondScreenMode.NONE) closeSecondScreen(reset = false) else updateKeyboardRoute()
|
||||
}
|
||||
|
||||
private fun layoutNames(): List<String> =
|
||||
@@ -2679,8 +2758,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
private fun refreshSecondScreenDisplays() {
|
||||
if (!::displayManager.isInitialized) return
|
||||
val primaryId = shownOnDisplayId
|
||||
val dualOff = SessionPrefs.dualScreenMode(this) == com.droiddeck.launcher.input.DualScreen.MODE_OFF
|
||||
val candidates = SecondScreenDisplays.available(displayManager, primaryId)
|
||||
.filter { glassesScreen == null || it.id != glasses.displayId }
|
||||
.filter { !dualOff && (glassesScreen == null || it.id != glasses.displayId) }
|
||||
val oldIds = secondScreenDisplays.map { it.id }.toSet()
|
||||
secondScreenDisplays = candidates
|
||||
val newIds = candidates.map { it.id }.toSet()
|
||||
@@ -2691,6 +2771,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (selectedSecondScreenDisplay !in newIds) selectedSecondScreenDisplay = candidates.firstOrNull()?.id ?: -1
|
||||
if (secondScreenMode != SecondScreenMode.NONE && candidates.isEmpty()) closeSecondScreen(reset = true)
|
||||
else if (started && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode)
|
||||
updateKeyboardRoute()
|
||||
}
|
||||
|
||||
private fun openDualScreenControls() {
|
||||
if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return
|
||||
if (!SessionPrefs.dualScreenSessionControls(this)) return
|
||||
val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return
|
||||
if (secondScreenDisplays.none { it.id == target.displayId }) return
|
||||
SessionState.secondScreenAutoOpened = true
|
||||
selectedSecondScreenDisplay = target.displayId
|
||||
selectSecondScreenMode(if (SessionState.deckPad) SecondScreenMode.DECK_CONTROLS else SecondScreenMode.KEYBOARD_TRACKPAD)
|
||||
}
|
||||
|
||||
private fun selectSecondScreenDisplay(displayId: Int) {
|
||||
@@ -2724,19 +2815,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
var presentation = secondScreenPresentation
|
||||
if (presentation?.display?.displayId != target.displayId) {
|
||||
dropDockedDrawer()
|
||||
presentation?.closeControls()
|
||||
presentation = SecondScreenPresentation(
|
||||
this, target,
|
||||
sendPointer = ::moveSecondScreenPointer,
|
||||
sendButton = { button, pressed ->
|
||||
WaylandCompositor.nativeSendSceneInput(3, button, if (pressed) 1 else 0)
|
||||
},
|
||||
sendWheel = { steps -> WaylandCompositor.nativeSendSceneInput(4, steps, 0) },
|
||||
onSteamMenu = ::tapSteamButton,
|
||||
onQam = ::tapQam,
|
||||
onClose = { selectSecondScreenMode(SecondScreenMode.NONE) },
|
||||
pad = padBridge,
|
||||
)
|
||||
presentation = secondScreenPresentation(target)
|
||||
secondScreenPresentation = presentation
|
||||
}
|
||||
try {
|
||||
@@ -2745,12 +2826,31 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
secondScreenMode = mode
|
||||
SessionState.secondScreenMode = mode
|
||||
SessionState.secondScreenDisplay = selectedSecondScreenDisplay
|
||||
updateKeyboardRoute()
|
||||
} catch (e: Exception) {
|
||||
Log.w(TAG, "could not show second-screen controls on ${target.name}", e)
|
||||
closeSecondScreen(reset = true)
|
||||
}
|
||||
}
|
||||
|
||||
private fun secondScreenPresentation(target: Display) = SecondScreenPresentation(
|
||||
this, target,
|
||||
sendPointer = ::moveSecondScreenPointer,
|
||||
sendButton = { button, pressed ->
|
||||
WaylandCompositor.nativeSendSceneInput(3, button, if (pressed) 1 else 0)
|
||||
},
|
||||
sendWheel = { steps -> WaylandCompositor.nativeSendSceneInput(4, steps, 0) },
|
||||
onSteamMenu = ::tapSteamButton,
|
||||
onQam = ::tapQam,
|
||||
onClose = { selectSecondScreenMode(SecondScreenMode.NONE) },
|
||||
pad = padBridge,
|
||||
onKeyboardClosed = ::bottomKeyboardClosed,
|
||||
onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null,
|
||||
menu = {
|
||||
DroidDeckTheme { SessionMenu(docked = true) }
|
||||
},
|
||||
)
|
||||
|
||||
private fun tapSteamButton() {
|
||||
if (SessionState.mode == SessionService.MODE_STEAM) {
|
||||
padBridge?.applyTouch { st -> st.press(com.droiddeck.launcher.input.PadState.GUIDE, true) }
|
||||
@@ -2833,9 +2933,49 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
showCursor(px, py)
|
||||
}
|
||||
|
||||
private fun openBottomKeyboard() {
|
||||
if (!started) return
|
||||
if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) {
|
||||
val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return
|
||||
if (drawerOpen) drawerOpen = false
|
||||
typingReturnMode = secondScreenMode
|
||||
selectedSecondScreenDisplay = target.displayId
|
||||
selectSecondScreenMode(SecondScreenMode.KEYBOARD_TRACKPAD)
|
||||
}
|
||||
val presentation = secondScreenPresentation ?: return
|
||||
if (!presentation.showsKeyboard) return
|
||||
val display = presentation.display?.displayId ?: return
|
||||
presentation.requestKeyboard(forField = true)
|
||||
com.droiddeck.launcher.ui.SessionTyping.focusDisplay(this, display)
|
||||
}
|
||||
|
||||
private fun bottomKeyboardClosed() {
|
||||
com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId)
|
||||
val mode = typingReturnMode ?: return
|
||||
typingReturnMode = null
|
||||
uiHandler.post { if (secondScreenMode == SecondScreenMode.KEYBOARD_TRACKPAD) selectSecondScreenMode(mode) }
|
||||
}
|
||||
|
||||
private fun updateKeyboardRoute() {
|
||||
AgentGuest.routeKeyboard(this, SessionState.mode == SessionService.MODE_STEAM &&
|
||||
(secondScreenPresentation?.showsKeyboard == true || dockDrawer()))
|
||||
}
|
||||
|
||||
private fun dropDockedDrawer() {
|
||||
if (!drawerDocked) return
|
||||
drawerDocked = false
|
||||
drawerLayerOpen = false
|
||||
drawerOpenState = false
|
||||
}
|
||||
|
||||
private fun closeSecondScreen(reset: Boolean) {
|
||||
dropDockedDrawer()
|
||||
val focused = secondScreenPresentation?.window?.decorView?.hasWindowFocus() == true
|
||||
secondScreenPresentation?.closeControls()
|
||||
secondScreenPresentation = null
|
||||
if (focused && started) com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId)
|
||||
else com.droiddeck.launcher.ui.SessionTyping.close()
|
||||
updateKeyboardRoute()
|
||||
if (reset) {
|
||||
secondScreenMode = SecondScreenMode.NONE
|
||||
SessionState.secondScreenMode = SecondScreenMode.NONE
|
||||
@@ -2896,9 +3036,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
|
||||
private var ignoreGameTouch = false
|
||||
private var dismissTouch = false
|
||||
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean {
|
||||
if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event)
|
||||
if (drawerOpen && drawerDocked && event.actionMasked == MotionEvent.ACTION_DOWN) {
|
||||
drawerOpen = false
|
||||
dismissTouch = true
|
||||
}
|
||||
if (dismissTouch) {
|
||||
if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) dismissTouch = false
|
||||
return true
|
||||
}
|
||||
if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) return true
|
||||
if (routedTouchMode == SessionPrefs.TOUCH_GESTURES) {
|
||||
if (event.actionMasked == MotionEvent.ACTION_DOWN) gesturePointerReady = false
|
||||
@@ -3289,6 +3438,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
refreshSecondScreenDisplays()
|
||||
if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode)
|
||||
else if (::loading.isInitialized && !loading.visible) openDualScreenControls()
|
||||
startedScreens++
|
||||
SessionService.setActivityVisible(this, true, sessionActivityDisplayId)
|
||||
Glasses.rescan()
|
||||
@@ -3809,6 +3959,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
loading.visible = false
|
||||
hud.start()
|
||||
memoryHud.start()
|
||||
if (started) openDualScreenControls()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,6 +22,12 @@ object AgentGuest {
|
||||
private set
|
||||
var steamKeyboard by mutableStateOf(false)
|
||||
private set
|
||||
var keyboardRequests by mutableIntStateOf(0)
|
||||
private set
|
||||
var keyboardDismissals by mutableIntStateOf(0)
|
||||
private set
|
||||
@Volatile private var keyboardRoute = false
|
||||
@Volatile private var routeDir: File? = null
|
||||
private const val TAG = "AgentGuest"
|
||||
private const val POLL_MS = 50L
|
||||
private val lock = Any()
|
||||
@@ -39,6 +45,8 @@ object AgentGuest {
|
||||
val dir = dir(context)
|
||||
dir.deleteRecursively()
|
||||
dir.mkdirs()
|
||||
routeDir = dir
|
||||
writeKeyboardRoute(dir, keyboardRoute)
|
||||
@Suppress("DEPRECATION")
|
||||
observer = object : FileObserver(dir.path, MOVED_TO or CLOSE_WRITE) {
|
||||
override fun onEvent(event: Int, path: String?) {
|
||||
@@ -48,6 +56,8 @@ object AgentGuest {
|
||||
}
|
||||
"focus.json" -> readJson(File(dir, path))?.let(::recordFocus)
|
||||
"keyboard.json" -> readJson(File(dir, path))?.let { recordKeyboard(this, it) }
|
||||
"keyboard-request.json" -> readJson(File(dir, path))?.let { recordKeyboardRequest(this) }
|
||||
"keyboard-dismiss.json" -> readJson(File(dir, path))?.let { recordKeyboardDismiss(this) }
|
||||
}
|
||||
}
|
||||
}.also { it.startWatching() }
|
||||
@@ -62,6 +72,42 @@ object AgentGuest {
|
||||
}
|
||||
}
|
||||
|
||||
fun routeKeyboard(context: Context, bottom: Boolean) {
|
||||
synchronized(lock) {
|
||||
if (keyboardRoute == bottom) return
|
||||
keyboardRoute = bottom
|
||||
writeKeyboardRoute(routeDir ?: dir(context), bottom)
|
||||
}
|
||||
}
|
||||
|
||||
private fun writeKeyboardRoute(dir: File, bottom: Boolean) {
|
||||
val file = File(dir, "keyboard-route")
|
||||
runCatching {
|
||||
if (!bottom) file.delete()
|
||||
else if (dir.isDirectory) {
|
||||
val temp = File(dir, "keyboard-route.tmp")
|
||||
temp.writeText("bottom")
|
||||
if (!temp.renameTo(file)) temp.delete()
|
||||
}
|
||||
}.onFailure { Log.w(TAG, "keyboard route not written", it) }
|
||||
}
|
||||
|
||||
private fun recordKeyboardRequest(source: FileObserver) {
|
||||
synchronized(lock) {
|
||||
if (source !== observer) return
|
||||
main.post { keyboardRequests++ }
|
||||
}
|
||||
SessionEvents.record("keyboard.requested", emptyMap())
|
||||
}
|
||||
|
||||
private fun recordKeyboardDismiss(source: FileObserver) {
|
||||
synchronized(lock) {
|
||||
if (source !== observer) return
|
||||
main.post { keyboardDismissals++ }
|
||||
}
|
||||
SessionEvents.record("keyboard.dismissed", emptyMap())
|
||||
}
|
||||
|
||||
private fun recordKeyboard(source: FileObserver, snapshot: JSONObject) {
|
||||
val showing = snapshot.optBoolean("steamKeyboard")
|
||||
synchronized(lock) {
|
||||
|
||||
@@ -16,6 +16,7 @@ data class GpuInfo(
|
||||
val modelSource: String = "",
|
||||
val kgslChipId: String = "",
|
||||
val platformGpuModel: Int = 0,
|
||||
val verifiedDevice: Boolean = false,
|
||||
) {
|
||||
enum class Family(val label: String) {
|
||||
A8XX("Adreno 8xx"),
|
||||
@@ -36,6 +37,7 @@ data class GpuInfo(
|
||||
get() = when {
|
||||
family == Family.NOT_ADRENO -> Support.UNSUPPORTED
|
||||
isA850 -> Support.UNTESTED
|
||||
verifiedDevice -> Support.TESTED
|
||||
family == Family.A6XX && model == 650 -> Support.TESTED
|
||||
family == Family.A8XX -> Support.TESTED
|
||||
family == Family.A7XX && model >= 725 -> Support.TESTED
|
||||
@@ -85,9 +87,13 @@ data class GpuInfo(
|
||||
oneUi8Gen2 = samsung && model == 740,
|
||||
kgslName = raw.orEmpty(), modelSource = source, kgslChipId = chipId,
|
||||
platformGpuModel = platformGpuModel,
|
||||
verifiedDevice = adreno && verifiedOn(model, Build.MODEL),
|
||||
)
|
||||
}
|
||||
|
||||
internal fun verifiedOn(model: Int, device: String): Boolean =
|
||||
model == 722 && device.equals("Retroid Pocket Duo", ignoreCase = true)
|
||||
|
||||
internal fun threeDigits(text: String): Int = Regex("""(?i)\badreno\s*(?:\(TM\)\s*)?(\d{3})(?!\d)""").find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0
|
||||
|
||||
internal fun modelFromNames(
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.content.Context
|
||||
import android.hardware.display.DisplayManager
|
||||
import android.os.Build
|
||||
import android.view.Display
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
|
||||
object DualScreen {
|
||||
const val MODE_AUTO = "auto"
|
||||
const val MODE_ON = "on"
|
||||
const val MODE_OFF = "off"
|
||||
val modes = listOf(MODE_AUTO, MODE_ON, MODE_OFF)
|
||||
private const val TYPE_INTERNAL = 1
|
||||
private val knownModels = setOf("retroid pocket duo", "ayn thor")
|
||||
|
||||
fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? =
|
||||
displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull {
|
||||
it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 &&
|
||||
isBuiltIn(displayType(it), Build.MODEL)
|
||||
}
|
||||
|
||||
fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? =
|
||||
when (SessionPrefs.dualScreenMode(context)) {
|
||||
MODE_OFF -> null
|
||||
MODE_ON -> builtInDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId)
|
||||
else -> builtInDisplay(displayManager, primaryDisplayId)
|
||||
}
|
||||
|
||||
fun anyDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? =
|
||||
displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull {
|
||||
it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0
|
||||
}
|
||||
|
||||
internal fun isBuiltIn(type: Int?, model: String): Boolean =
|
||||
if (type != null) type == TYPE_INTERNAL else model.trim().lowercase() in knownModels
|
||||
|
||||
private fun displayType(display: Display): Int? =
|
||||
runCatching { Display::class.java.getMethod("getType").invoke(display) as Int }.getOrNull()
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.os.Build
|
||||
import android.view.KeyEvent
|
||||
|
||||
class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCancel: () -> Unit = {}) {
|
||||
@@ -8,6 +9,10 @@ class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCa
|
||||
|
||||
fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean {
|
||||
if (!isHome(event.keyCode)) return false
|
||||
if (isQuickMenuKey(event)) {
|
||||
if (event.action == KeyEvent.ACTION_DOWN) cancel()
|
||||
return false
|
||||
}
|
||||
if (!enabled) cancel()
|
||||
val device = event.deviceId
|
||||
return when (event.action) {
|
||||
@@ -43,5 +48,10 @@ class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCa
|
||||
companion object {
|
||||
// The Retroid Nova pad falls back to Generic.kl, which maps its Home scan code to MOVE_HOME.
|
||||
fun isHome(keyCode: Int) = keyCode == KeyEvent.KEYCODE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_HOME
|
||||
|
||||
private const val DUO_QUICK_MENU_SCAN_CODE = 194
|
||||
|
||||
fun isQuickMenuKey(event: KeyEvent) =
|
||||
event.scanCode == DUO_QUICK_MENU_SCAN_CODE && "Retroid Pocket Duo".equals(Build.MODEL, ignoreCase = true)
|
||||
}
|
||||
}
|
||||
@@ -86,6 +86,26 @@ object SessionPrefs {
|
||||
prefs(context).edit().putBoolean("animations", on).apply()
|
||||
}
|
||||
|
||||
fun dualScreenMode(context: Context): String =
|
||||
prefs(context).getString("dualScreenMode", null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes }
|
||||
?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO
|
||||
|
||||
fun setDualScreenMode(context: Context, mode: String) {
|
||||
prefs(context).edit().putString("dualScreenMode", mode).apply()
|
||||
}
|
||||
|
||||
fun dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true)
|
||||
|
||||
fun setDualScreenLauncher(context: Context, on: Boolean) {
|
||||
prefs(context).edit().putBoolean("dualScreenLauncher", on).apply()
|
||||
}
|
||||
|
||||
fun dualScreenSessionControls(context: Context): Boolean = prefs(context).getBoolean("dualScreenSessionControls", true)
|
||||
|
||||
fun setDualScreenSessionControls(context: Context, on: Boolean) {
|
||||
prefs(context).edit().putBoolean("dualScreenSessionControls", on).apply()
|
||||
}
|
||||
|
||||
fun gameStoresEnabled(context: Context): Boolean = prefs(context).getBoolean("gameStoresEnabled", true)
|
||||
|
||||
fun setGameStoresEnabled(context: Context, on: Boolean) {
|
||||
|
||||
@@ -546,6 +546,7 @@ class SessionService : Service() {
|
||||
val fakeInputDir = File(sessionRoot, "dev/input").apply { mkdirs() }
|
||||
val controllersOn = !File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists()
|
||||
SessionState.deckPad = false
|
||||
SessionState.secondScreenAutoOpened = false
|
||||
deckBinds = emptyList()
|
||||
inputSysfs = null
|
||||
if (controllersOn) {
|
||||
@@ -1882,6 +1883,9 @@ class SessionService : Service() {
|
||||
}
|
||||
|
||||
override fun onTaskRemoved(rootIntent: Intent?) {
|
||||
if (rootIntent?.component?.className in setOf(
|
||||
com.droiddeck.launcher.ui.DualScreenActivity::class.java.name,
|
||||
com.droiddeck.launcher.ui.SessionTypingActivity::class.java.name)) return
|
||||
if (pipTask || xrActivityVisible) {
|
||||
Log.i(TAG, "panel task dismissed - retaining the session under its active surface policy")
|
||||
activityVisible = false
|
||||
|
||||
@@ -91,6 +91,7 @@ object SessionState {
|
||||
|
||||
@Volatile var secondScreenMode = com.droiddeck.launcher.input.SecondScreenMode.NONE
|
||||
@Volatile var secondScreenDisplay = -1
|
||||
@Volatile var secondScreenAutoOpened = false
|
||||
|
||||
@Volatile
|
||||
var mode = "steam"
|
||||
|
||||
@@ -12,6 +12,7 @@ object SettingsReset {
|
||||
|
||||
internal val SESSION_KEYS = setOf(
|
||||
"orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt",
|
||||
"dualScreenMode", "dualScreenLauncher", "dualScreenSessionControls",
|
||||
"gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature",
|
||||
"storesInstallLanguage",
|
||||
"hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "fusionHud", "fusionHudPos", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController",
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.text.KeyboardActions
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.staticCompositionLocalOf
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.focus.FocusRequester
|
||||
import androidx.compose.ui.focus.focusRequester
|
||||
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
|
||||
import androidx.compose.ui.platform.testTag
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.CommitTextCommand
|
||||
import androidx.compose.ui.text.input.DeleteAllCommand
|
||||
import androidx.compose.ui.text.input.EditCommand
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.text.input.ImeOptions
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.PlatformTextInputService
|
||||
import androidx.compose.ui.text.input.SetSelectionCommand
|
||||
import androidx.compose.ui.text.input.TextFieldValue
|
||||
import androidx.compose.ui.text.input.TextInputService
|
||||
import androidx.compose.ui.text.input.TextInputSession
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.droiddeck.launcher.R
|
||||
|
||||
class TypingRequest(
|
||||
initial: TextFieldValue,
|
||||
val imeOptions: ImeOptions,
|
||||
private val onValue: (TextFieldValue) -> Unit,
|
||||
private val onImeAction: (ImeAction) -> Unit,
|
||||
private val onClose: () -> Unit = {},
|
||||
) {
|
||||
var value by mutableStateOf(initial)
|
||||
|
||||
fun send(next: TextFieldValue) {
|
||||
value = next
|
||||
onValue(next)
|
||||
}
|
||||
|
||||
fun action() = onImeAction(imeOptions.imeAction)
|
||||
|
||||
fun close() = onClose()
|
||||
|
||||
companion object {
|
||||
internal fun editsFor(next: TextFieldValue): List<EditCommand> = listOf(
|
||||
DeleteAllCommand(),
|
||||
CommitTextCommand(next.text, 1),
|
||||
SetSelectionCommand(next.selection.start, next.selection.end),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
internal val LocalBottomTyping = staticCompositionLocalOf { false }
|
||||
|
||||
internal class BottomScreenTextInput(private val fallback: TextInputService) : PlatformTextInputService {
|
||||
private var session: TextInputSession? = null
|
||||
|
||||
override fun startInput(
|
||||
value: TextFieldValue, imeOptions: ImeOptions,
|
||||
onEditCommand: (List<EditCommand>) -> Unit, onImeActionPerformed: (ImeAction) -> Unit,
|
||||
) {
|
||||
session?.let { fallback.stopInput(it) }
|
||||
session = null
|
||||
if (DualScreenPanel.attached) DualScreenPanel.startTyping(TypingRequest(value, imeOptions, { onEditCommand(TypingRequest.editsFor(it)) }, onImeActionPerformed))
|
||||
else session = fallback.startInput(value, imeOptions, onEditCommand, onImeActionPerformed)
|
||||
}
|
||||
|
||||
override fun stopInput() {
|
||||
session?.let { fallback.stopInput(it) }
|
||||
session = null
|
||||
DualScreenPanel.stopTyping()
|
||||
}
|
||||
|
||||
override fun showSoftwareKeyboard() {
|
||||
val active = session
|
||||
if (active != null) active.showSoftwareKeyboard() else DualScreenPanel.showTyping()
|
||||
}
|
||||
|
||||
override fun hideSoftwareKeyboard() {
|
||||
val active = session
|
||||
if (active != null) active.hideSoftwareKeyboard() else DualScreenPanel.hideTyping()
|
||||
}
|
||||
|
||||
override fun updateState(oldValue: TextFieldValue?, newValue: TextFieldValue) {
|
||||
val active = session
|
||||
if (active != null) active.updateState(oldValue, newValue) else DualScreenPanel.updateTyping(newValue)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun TypingPanel(request: TypingRequest, onDone: () -> Unit) {
|
||||
val colors = MaterialTheme.colorScheme
|
||||
var field by remember(request) { mutableStateOf(request.value) }
|
||||
LaunchedEffect(request.value) {
|
||||
if (request.value.text != field.text) field = request.value
|
||||
}
|
||||
val focus = remember { FocusRequester() }
|
||||
val keyboard = LocalSoftwareKeyboardController.current
|
||||
LaunchedEffect(request) {
|
||||
kotlinx.coroutines.delay(120)
|
||||
runCatching { focus.requestFocus() }
|
||||
keyboard?.show()
|
||||
}
|
||||
val options = request.imeOptions
|
||||
val secret = options.keyboardType == KeyboardType.Password || options.keyboardType == KeyboardType.NumberPassword
|
||||
Column(
|
||||
Modifier.fillMaxSize().background(colors.background).padding(horizontal = 20.dp, vertical = 14.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp),
|
||||
) {
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(stringResource(R.string.dual_typing_title), fontSize = 15.sp, fontWeight = FontWeight.SemiBold,
|
||||
color = colors.onSurfaceVariant, modifier = Modifier.weight(1f))
|
||||
Button(onClick = onDone, modifier = Modifier.testTag("dual-typing-done")) { Text(stringResource(R.string.dual_typing_done)) }
|
||||
}
|
||||
OutlinedTextField(
|
||||
value = field,
|
||||
onValueChange = { next ->
|
||||
field = next
|
||||
request.send(next)
|
||||
},
|
||||
singleLine = options.singleLine,
|
||||
maxLines = if (options.singleLine) 1 else 4,
|
||||
textStyle = MaterialTheme.typography.titleLarge,
|
||||
visualTransformation = if (secret) PasswordVisualTransformation() else VisualTransformation.None,
|
||||
keyboardOptions = KeyboardOptions(
|
||||
capitalization = options.capitalization, autoCorrect = options.autoCorrect,
|
||||
keyboardType = options.keyboardType, imeAction = options.imeAction,
|
||||
),
|
||||
keyboardActions = KeyboardActions(onAny = {
|
||||
request.action()
|
||||
onDone()
|
||||
}),
|
||||
modifier = Modifier.fillMaxWidth().focusRequester(focus).testTag("dual-typing-field"),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,7 @@ class DeckControlsPanel(
|
||||
private val onQam: () -> Unit,
|
||||
private val pad: PadBridge? = null,
|
||||
private val portraitDock: Boolean = false,
|
||||
private val onMenu: (() -> Unit)? = null,
|
||||
) : LinearLayout(context) {
|
||||
private enum class Tab(val label: Int) { GAMEPAD(R.string.deck_tab_gamepad), GRIPS(R.string.deck_tab_grips), LEFT(R.string.deck_tab_left), RIGHT(R.string.deck_tab_right), BOTH(R.string.deck_tab_both) }
|
||||
|
||||
@@ -90,6 +91,10 @@ class DeckControlsPanel(
|
||||
addView(tabs, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, dp(44)))
|
||||
}
|
||||
addView(centre, LayoutParams(0, LayoutParams.MATCH_PARENT, 1f))
|
||||
onMenu?.let {
|
||||
addView(menuButton(context, it))
|
||||
addView(space(dp(8)))
|
||||
}
|
||||
if (SessionState.mode == SessionService.MODE_STEAM) {
|
||||
addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true))
|
||||
addView(space(dp(8)))
|
||||
@@ -250,38 +255,19 @@ class DeckControlsPanel(
|
||||
}
|
||||
|
||||
private fun roundButton(label: String, description: String, onClick: () -> Unit, wide: Boolean = false) =
|
||||
TextView(context).apply {
|
||||
text = label
|
||||
contentDescription = description
|
||||
textSize = if (wide) 13f else 20f
|
||||
typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
|
||||
letterSpacing = if (wide) 0.08f else 0f
|
||||
gravity = Gravity.CENTER
|
||||
setTextColor(TEXT)
|
||||
background = outline(CORNER_PILL, SURFACE)
|
||||
setPadding(if (wide) dp(16) else 0, 0, if (wide) dp(16) else 0, 0)
|
||||
minWidth = dp(44)
|
||||
layoutParams = LayoutParams(if (wide) LayoutParams.WRAP_CONTENT else dp(44), dp(44))
|
||||
setOnClickListener {
|
||||
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
|
||||
onClick()
|
||||
}
|
||||
}
|
||||
roundButton(context, label, description, onClick, wide)
|
||||
|
||||
private fun space(width: Int) = View(context).apply { layoutParams = LayoutParams(width, 1) }
|
||||
|
||||
private fun outline(radius: Float, fill: Int) = GradientDrawable().apply {
|
||||
cornerRadius = radius * resources.displayMetrics.density
|
||||
setColor(fill)
|
||||
setStroke(dp(1), LINE)
|
||||
}
|
||||
private fun outline(radius: Float, fill: Int) = outline(context, radius, fill)
|
||||
|
||||
private fun filled(radius: Float, fill: Int) = GradientDrawable().apply {
|
||||
cornerRadius = radius * resources.displayMetrics.density
|
||||
setColor(fill)
|
||||
}
|
||||
|
||||
private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt()
|
||||
private fun dp(value: Int): Int = dp(context, value)
|
||||
|
||||
|
||||
private abstract class Surface(context: Context) : View(context) {
|
||||
protected val density = resources.displayMetrics.density
|
||||
@@ -686,5 +672,47 @@ class DeckControlsPanel(
|
||||
private val TEXT = Color.rgb(0xF2, 0xF4, 0xF7)
|
||||
private val TEXT_DIM = Color.rgb(0x7A, 0x80, 0x8A)
|
||||
private val KNOB = Color.rgb(0x2A, 0x2D, 0x33)
|
||||
|
||||
internal fun dp(context: Context, value: Int): Int = (value * context.resources.displayMetrics.density + 0.5f).toInt()
|
||||
|
||||
internal fun outline(context: Context, radius: Float, fill: Int) = GradientDrawable().apply {
|
||||
cornerRadius = radius * context.resources.displayMetrics.density
|
||||
setColor(fill)
|
||||
setStroke(dp(context, 1), LINE)
|
||||
}
|
||||
|
||||
internal fun roundButton(context: Context, label: String, description: String, onClick: () -> Unit, wide: Boolean = false) =
|
||||
TextView(context).apply {
|
||||
text = label
|
||||
contentDescription = description
|
||||
textSize = if (wide) 13f else 20f
|
||||
typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
|
||||
letterSpacing = if (wide) 0.08f else 0f
|
||||
gravity = Gravity.CENTER
|
||||
setTextColor(TEXT)
|
||||
background = outline(context, CORNER_PILL, SURFACE)
|
||||
setPadding(if (wide) dp(context, 16) else 0, 0, if (wide) dp(context, 16) else 0, 0)
|
||||
minWidth = dp(context, 44)
|
||||
layoutParams = LinearLayout.LayoutParams(if (wide) LinearLayout.LayoutParams.WRAP_CONTENT else dp(context, 44), dp(context, 44))
|
||||
setOnClickListener {
|
||||
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
|
||||
onClick()
|
||||
}
|
||||
}
|
||||
|
||||
internal fun menuButton(context: Context, onClick: () -> Unit) = android.widget.ImageView(context).apply {
|
||||
setImageResource(R.drawable.ic_stat_session)
|
||||
setColorFilter(TEXT)
|
||||
contentDescription = context.getString(R.string.touch_droiddeck_menu)
|
||||
scaleType = android.widget.ImageView.ScaleType.CENTER_INSIDE
|
||||
val pad = dp(context, 11)
|
||||
setPadding(pad, pad, pad, pad)
|
||||
background = outline(context, CORNER_PILL, SURFACE)
|
||||
layoutParams = LinearLayout.LayoutParams(dp(context, 44), dp(context, 44))
|
||||
setOnClickListener {
|
||||
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
|
||||
onClick()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,341 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import android.app.ActivityOptions
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.KeyEvent
|
||||
import android.view.View
|
||||
import android.view.WindowManager
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.testTag
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.TextFieldValue
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.droiddeck.launcher.R
|
||||
|
||||
class DualPanelModel(
|
||||
val keys: List<String>,
|
||||
val selected: String,
|
||||
val badges: Set<String>,
|
||||
val storeDownloads: Int,
|
||||
val running: String?,
|
||||
val theme: String,
|
||||
val appScale: Int,
|
||||
val onSelect: (String) -> Unit,
|
||||
val onResume: () -> Unit,
|
||||
)
|
||||
|
||||
object DualScreenPanel {
|
||||
var model by mutableStateOf<DualPanelModel?>(null)
|
||||
private var displayId = -1
|
||||
private var activity: DualScreenActivity? = null
|
||||
set(value) { field = value; available = value != null || launching }
|
||||
private var launching = false
|
||||
set(value) { field = value; available = value || activity != null }
|
||||
private var ownerTask = -1
|
||||
|
||||
var typing by mutableStateOf<TypingRequest?>(null)
|
||||
private set
|
||||
var typingShown by mutableStateOf(false)
|
||||
private set
|
||||
|
||||
val shownOn: Int get() = if (activity != null || launching) displayId else -1
|
||||
val attached: Boolean get() = activity != null
|
||||
var available by mutableStateOf(false)
|
||||
private set
|
||||
|
||||
fun startTyping(request: TypingRequest) {
|
||||
typing = request
|
||||
typingShown = true
|
||||
}
|
||||
|
||||
fun stopTyping() {
|
||||
typing = null
|
||||
typingShown = false
|
||||
}
|
||||
|
||||
fun stopTyping(request: TypingRequest) {
|
||||
if (typing === request) stopTyping()
|
||||
}
|
||||
|
||||
fun showTyping() {
|
||||
if (typing != null) typingShown = true
|
||||
}
|
||||
|
||||
fun finishTyping() {
|
||||
val request = typing
|
||||
hideTyping()
|
||||
request?.close()
|
||||
}
|
||||
|
||||
fun hideTyping() {
|
||||
typingShown = false
|
||||
}
|
||||
|
||||
fun updateTyping(value: TextFieldValue) {
|
||||
val request = typing ?: return
|
||||
if (request.value != value) request.value = value
|
||||
}
|
||||
|
||||
fun show(context: Context, display: Int, task: Int) {
|
||||
if (shownOn == display) return
|
||||
hide()
|
||||
displayId = display
|
||||
ownerTask = task
|
||||
launching = true
|
||||
val intent = Intent(context, DualScreenActivity::class.java)
|
||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION)
|
||||
runCatching {
|
||||
context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle())
|
||||
}.onFailure { launching = false; displayId = -1 }
|
||||
}
|
||||
|
||||
fun hide() {
|
||||
stopTyping()
|
||||
launching = false
|
||||
displayId = -1
|
||||
activity?.finishAndRemoveTask()
|
||||
activity = null
|
||||
}
|
||||
|
||||
internal fun attach(host: DualScreenActivity): Boolean {
|
||||
if (!launching && activity == null) return false
|
||||
if (activity !== host) activity?.finishAndRemoveTask()
|
||||
activity = host
|
||||
launching = false
|
||||
return true
|
||||
}
|
||||
|
||||
internal fun returnFocus(context: Context) {
|
||||
val task = ownerTask.takeIf { it >= 0 } ?: return
|
||||
runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(task, 0) }
|
||||
}
|
||||
|
||||
internal fun detach(host: DualScreenActivity) {
|
||||
if (activity === host) {
|
||||
activity = null
|
||||
displayId = -1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class DualScreenActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
if (!DualScreenPanel.attach(this)) {
|
||||
finishAndRemoveTask()
|
||||
return
|
||||
}
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
||||
applyImmersiveMode()
|
||||
setContent {
|
||||
val model = DualScreenPanel.model
|
||||
val request = DualScreenPanel.typing
|
||||
val typingOn = request != null && DualScreenPanel.typingShown
|
||||
LaunchedEffect(typingOn) { acceptFocus(typingOn) }
|
||||
DroidDeckTheme(model?.theme, appScale = model?.appScale ?: com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) {
|
||||
Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) {
|
||||
if (request != null && typingOn) TypingPanel(request) { if (DualScreenPanel.typing === request) DualScreenPanel.finishTyping() }
|
||||
else if (model != null) DualPanelContent(model)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun acceptFocus(on: Boolean) {
|
||||
if (on) {
|
||||
unfocusPending = false
|
||||
window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
|
||||
runCatching { (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(taskId, 0) }
|
||||
} else {
|
||||
unfocusPending = true
|
||||
DualScreenPanel.returnFocus(this)
|
||||
window.decorView.postDelayed({
|
||||
if (!unfocusPending || DualScreenPanel.typingShown) return@postDelayed
|
||||
if (window.decorView.hasWindowFocus()) DualScreenPanel.returnFocus(this) else dropFocus()
|
||||
}, 400)
|
||||
}
|
||||
}
|
||||
|
||||
private var unfocusPending = false
|
||||
|
||||
private fun dropFocus() {
|
||||
unfocusPending = false
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
if (!DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this)
|
||||
}
|
||||
|
||||
override fun onWindowFocusChanged(hasFocus: Boolean) {
|
||||
super.onWindowFocusChanged(hasFocus)
|
||||
if (hasFocus) applyImmersiveMode()
|
||||
else if (unfocusPending && !DualScreenPanel.typingShown) dropFocus()
|
||||
}
|
||||
|
||||
@Suppress("OVERRIDE_DEPRECATION")
|
||||
override fun onBackPressed() {
|
||||
if (DualScreenPanel.typingShown) DualScreenPanel.finishTyping()
|
||||
}
|
||||
|
||||
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
|
||||
if (DualScreenPanel.typingShown && event.keyCode == KeyEvent.KEYCODE_BUTTON_B) {
|
||||
if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping()
|
||||
return true
|
||||
}
|
||||
return super.dispatchKeyEvent(event)
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
DualScreenPanel.detach(this)
|
||||
super.onDestroy()
|
||||
}
|
||||
|
||||
private fun applyImmersiveMode() {
|
||||
@Suppress("DEPRECATION")
|
||||
window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
|
||||
or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
||||
or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
||||
or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun DualPanelContent(model: DualPanelModel) {
|
||||
val colors = MaterialTheme.colorScheme
|
||||
val pal = LocalPalette.current
|
||||
Column(Modifier.fillMaxSize().padding(horizontal = 20.dp, vertical = 16.dp), verticalArrangement = Arrangement.spacedBy(14.dp)) {
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(stringResource(R.string.app_name), fontSize = 15.sp, fontWeight = FontWeight.Bold, color = pal.signal)
|
||||
Spacer(Modifier.size(12.dp))
|
||||
val (label, _) = railLabelIcon(model.selected)
|
||||
Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground,
|
||||
modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis)
|
||||
PanelClock()
|
||||
}
|
||||
BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) {
|
||||
val columns = if (model.keys.size > 6) 4 else 3
|
||||
val rows = (model.keys.size + columns - 1) / columns
|
||||
val gap = 12.dp
|
||||
val tileHeight = ((maxHeight - gap * (rows - 1)) / rows).coerceAtLeast(64.dp)
|
||||
Column(verticalArrangement = Arrangement.spacedBy(gap)) {
|
||||
for (row in model.keys.chunked(columns)) {
|
||||
Row(Modifier.fillMaxWidth().height(tileHeight), horizontalArrangement = Arrangement.spacedBy(gap)) {
|
||||
for (key in row) PanelTile(key, key == model.selected, key in model.badges,
|
||||
if (key == "stores") model.storeDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) }
|
||||
repeat(columns - row.size) { Spacer(Modifier.weight(1f)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (model.running != null) {
|
||||
Row(
|
||||
Modifier.fillMaxWidth().height(56.dp).clip(RoundedCornerShape(16.dp)).background(pal.good.copy(alpha = 0.18f))
|
||||
.clickable(role = Role.Button, onClick = model.onResume).testTag("dual-resume").padding(horizontal = 18.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Box(Modifier.size(10.dp).clip(CircleShape).background(pal.good))
|
||||
Spacer(Modifier.size(12.dp))
|
||||
Text(stringResource(R.string.rail_resume_named, model.running), fontSize = 16.sp, fontWeight = FontWeight.SemiBold,
|
||||
color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun PanelTile(key: String, current: Boolean, badge: Boolean, count: Int, modifier: Modifier, onClick: () -> Unit) {
|
||||
val colors = MaterialTheme.colorScheme
|
||||
val pal = LocalPalette.current
|
||||
val (label, icon) = railLabelIcon(key)
|
||||
val shape = RoundedCornerShape(18.dp)
|
||||
Box(
|
||||
modifier.fillMaxSize().clip(shape)
|
||||
.background(if (current) pal.signal.copy(alpha = 0.16f) else colors.surface)
|
||||
.border(if (current) 2.dp else 1.dp, if (current) pal.signal else Color.White.copy(alpha = 0.06f), shape)
|
||||
.clickable(role = Role.Tab, onClick = onClick).testTag("dual-rail-$key"),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Icon(icon, contentDescription = null, tint = if (current) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(34.dp))
|
||||
Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold,
|
||||
color = if (current) pal.signal else colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(horizontal = 6.dp))
|
||||
}
|
||||
if (badge) Box(Modifier.align(Alignment.TopEnd).padding(12.dp).size(10.dp).clip(CircleShape).background(AttentionAmber))
|
||||
if (count > 0) Text(
|
||||
if (count > 9) "9+" else count.toString(), fontSize = 12.sp, fontWeight = FontWeight.Bold, color = pal.onSignal,
|
||||
modifier = Modifier.align(Alignment.TopEnd).padding(10.dp).clip(RoundedCornerShape(8.dp)).background(pal.signal)
|
||||
.padding(horizontal = 6.dp, vertical = 1.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun PanelClock() {
|
||||
val context = LocalContext.current
|
||||
var now by remember { mutableStateOf(System.currentTimeMillis()) }
|
||||
LaunchedEffect(Unit) {
|
||||
while (true) {
|
||||
now = System.currentTimeMillis()
|
||||
kotlinx.coroutines.delay(60_000L - now % 60_000L)
|
||||
}
|
||||
}
|
||||
Text(android.text.format.DateFormat.getTimeFormat(context).format(java.util.Date(now)), fontSize = 15.sp,
|
||||
fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun DualPanelPublisher(s: FrontEndState, selected: String, onSelect: (String) -> Unit, a: FrontEndActions) {
|
||||
val badges = buildSet {
|
||||
if (setupNeedsAttention(s)) add("setup")
|
||||
if (s.updates.hasUpdate) add("updates")
|
||||
}
|
||||
val model = DualPanelModel(navigationKeys(s), selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume)
|
||||
androidx.compose.runtime.SideEffect { DualScreenPanel.model = model }
|
||||
androidx.compose.runtime.DisposableEffect(Unit) { onDispose { DualScreenPanel.model = null } }
|
||||
}
|
||||
|
||||
internal fun dualPageStep(event: android.view.KeyEvent): Int? = when (event.keyCode) {
|
||||
android.view.KeyEvent.KEYCODE_BUTTON_L2 -> -1
|
||||
android.view.KeyEvent.KEYCODE_BUTTON_R2 -> 1
|
||||
else -> null
|
||||
}
|
||||
@@ -191,24 +191,28 @@ internal fun SideRail(
|
||||
}
|
||||
}
|
||||
|
||||
internal fun railLabelIcon(key: String): Pair<Int, ImageVector> = when (key) {
|
||||
"steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports
|
||||
"games" -> R.string.rail_games to Icons.Outlined.VideoLibrary
|
||||
"stores" -> R.string.rail_stores to Icons.Outlined.LocalMall
|
||||
"desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows
|
||||
"components" -> R.string.rail_components to Icons.Outlined.Layers
|
||||
"android-apps" -> R.string.rail_apps to Icons.Outlined.Apps
|
||||
"setup" -> R.string.rail_setup to Icons.Outlined.Tune
|
||||
else -> R.string.rail_updates to Icons.Outlined.SystemUpdate
|
||||
}
|
||||
|
||||
internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) ||
|
||||
PhantomProcessLimit.blocksSteam(s.phantomProcessStatus)
|
||||
|
||||
@Composable
|
||||
private fun NavigationItems(
|
||||
s: FrontEndState, shown: String, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp,
|
||||
place: (String) -> Modifier, onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit,
|
||||
) {
|
||||
val setupNeedsAttention = !s.ready || (s.available != null && s.available != s.installed) ||
|
||||
PhantomProcessLimit.blocksSteam(s.phantomProcessStatus)
|
||||
val setupNeedsAttention = setupNeedsAttention(s)
|
||||
for (key in navigationKeys(s)) {
|
||||
val (label, icon) = when (key) {
|
||||
"steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports
|
||||
"games" -> R.string.rail_games to Icons.Outlined.VideoLibrary
|
||||
"stores" -> R.string.rail_stores to Icons.Outlined.LocalMall
|
||||
"desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows
|
||||
"components" -> R.string.rail_components to Icons.Outlined.Layers
|
||||
"android-apps" -> R.string.rail_apps to Icons.Outlined.Apps
|
||||
"setup" -> R.string.rail_setup to Icons.Outlined.Tune
|
||||
else -> R.string.rail_updates to Icons.Outlined.SystemUpdate
|
||||
}
|
||||
val (label, icon) = railLabelIcon(key)
|
||||
key(key) {
|
||||
RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width,
|
||||
badge = (key == "setup" && setupNeedsAttention) || (key == "updates" && s.updates.hasUpdate),
|
||||
|
||||
@@ -69,6 +69,9 @@ import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalWindowInfo
|
||||
import androidx.compose.ui.platform.LocalInputModeManager
|
||||
import androidx.compose.ui.input.InputMode
|
||||
import androidx.compose.ui.input.key.KeyEventType
|
||||
import androidx.compose.ui.input.key.onKeyEvent
|
||||
import androidx.compose.ui.input.key.type
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.compose.ui.layout.onGloballyPositioned
|
||||
@@ -127,6 +130,11 @@ class FrontEndState(
|
||||
val integrationFocus: com.droiddeck.launcher.core.SteamIntegration.Feature? = null,
|
||||
val androidApps: List<HomeApp.LaunchableApp> = emptyList(),
|
||||
val secondScreenDisplays: List<SecondScreenDisplay> = emptyList(),
|
||||
val dualScreen: Boolean = false,
|
||||
val dualScreenDevice: Boolean = false,
|
||||
val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO,
|
||||
val dualScreenLauncher: Boolean = true,
|
||||
val dualScreenControls: Boolean = true,
|
||||
val packages: List<PackageRow>? = null,
|
||||
val packageCatalogLoading: Boolean = false,
|
||||
val packageBusyId: String? = null,
|
||||
@@ -229,6 +237,9 @@ class FrontEndActions(
|
||||
val onLauncherOrientation: (Int) -> Unit = {},
|
||||
val onLauncherFullscreen: (Boolean) -> Unit = {},
|
||||
val onAnimationsEnabled: (Boolean) -> Unit = {},
|
||||
val onDualScreenMode: (String) -> Unit = {},
|
||||
val onDualScreenLauncher: (Boolean) -> Unit = {},
|
||||
val onDualScreenControls: (Boolean) -> Unit = {},
|
||||
val onDownloadSource: (String) -> Unit = {},
|
||||
val onDownloadMirror: (String) -> Unit = {},
|
||||
val onDownloadPrefix: (String) -> Unit = {},
|
||||
@@ -401,10 +412,14 @@ internal suspend fun focusSoon(target: () -> FocusRequester) {
|
||||
@Composable
|
||||
fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)? = null) {
|
||||
val frontFocus = remember { FrontFocus() }
|
||||
val textInput = androidx.compose.ui.platform.LocalTextInputService.current
|
||||
val bottomTextInput = remember(textInput) { textInput?.let { androidx.compose.ui.text.input.TextInputService(BottomScreenTextInput(it)) } }
|
||||
androidx.compose.foundation.layout.BoxWithConstraints(Modifier.fillMaxSize()) {
|
||||
CompositionLocalProvider(
|
||||
LocalFrontFocus provides frontFocus,
|
||||
LocalNarrowPane provides (maxWidth < NarrowPaneWidth),
|
||||
androidx.compose.ui.platform.LocalTextInputService provides (if (s.dualScreen) bottomTextInput else textInput),
|
||||
LocalBottomTyping provides s.dualScreen,
|
||||
) { FrontEndScreenBody(s, a, page, frontFocus) }
|
||||
}
|
||||
}
|
||||
@@ -550,6 +565,18 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com
|
||||
val window = LocalWindowInfo.current
|
||||
val androidContext = androidx.compose.ui.platform.LocalContext.current
|
||||
var anyFocused by remember { mutableStateOf(false) }
|
||||
val paneRequester = remember { FocusRequester() }
|
||||
val focusManager = androidx.compose.ui.platform.LocalFocusManager.current
|
||||
suspend fun focusDualPane() {
|
||||
repeat(30) {
|
||||
withFrameNanos { }
|
||||
if (anyFocused) return
|
||||
runCatching { paneRequester.requestFocus() }
|
||||
if (anyFocused) return
|
||||
focusManager.moveFocus(FocusDirection.Down)
|
||||
if (anyFocused) return
|
||||
}
|
||||
}
|
||||
androidx.compose.foundation.layout.BoxWithConstraints(
|
||||
modifier = Modifier.fillMaxSize().background(colors.background)
|
||||
.windowInsetsPadding(if (s.launcherFullscreen) WindowInsets.displayCutout else WindowInsets.systemBars)
|
||||
@@ -560,7 +587,8 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com
|
||||
if (processSettingsPageVisible) return@LaunchedEffect
|
||||
snapshotFlow { window.isWindowFocused }.first { it }
|
||||
if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard)
|
||||
focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) }
|
||||
if (s.dualScreen && frontFocus.primaryAttached == 0) focusDualPane()
|
||||
else focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) }
|
||||
}
|
||||
var openPage by remember { mutableStateOf<String?>(null) }
|
||||
LaunchedEffect(s.pageKey) {
|
||||
@@ -582,16 +610,22 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com
|
||||
return@LaunchedEffect
|
||||
}
|
||||
if (anyFocused) return@LaunchedEffect
|
||||
focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) }
|
||||
if (s.dualScreen && frontFocus.primaryAttached == 0) focusDualPane()
|
||||
else focusWithinFrames({ anyFocused }) { if (frontFocus.primaryAttached > 0) frontFocus.primary else frontFocus.railFor(railSelection) }
|
||||
}
|
||||
LaunchedEffect(railPicks) {
|
||||
if (railPicks == 0 || processSettingsPageVisible) return@LaunchedEffect
|
||||
kotlinx.coroutines.delay(Motion.ms(PAGE_EXIT_MS).toLong())
|
||||
if (inputModeManager.inputMode != InputMode.Keyboard) return@LaunchedEffect
|
||||
withTimeoutOrNull(1_000) { snapshotFlow { frontFocus.primaryAttached > 0 }.first { it } } ?: return@LaunchedEffect
|
||||
val entry = withTimeoutOrNull(1_000) { snapshotFlow { frontFocus.primaryAttached > 0 }.first { it } }
|
||||
if (entry == null) {
|
||||
if (s.dualScreen) focusDualPane()
|
||||
return@LaunchedEffect
|
||||
}
|
||||
focusWithinFrames({ frontFocus.focusedRail == null && anyFocused }) { frontFocus.paneEntry() }
|
||||
}
|
||||
val paneFocus = Modifier
|
||||
.focusRequester(paneRequester)
|
||||
.focusProperties {
|
||||
enter = { frontFocus.paneEntry() }
|
||||
exit = { direction ->
|
||||
@@ -617,12 +651,31 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com
|
||||
focusWithinFrames({ frontFocus.last == r.control && anyFocused }) { frontFocus.items[r.control] ?: frontFocus.paneEntry() }
|
||||
}
|
||||
var screenAt by remember { mutableStateOf(Offset.Zero) }
|
||||
if (s.dualScreen) DualPanelPublisher(s, railSelection, { key ->
|
||||
if (processSettingsPageVisible) return@DualPanelPublisher
|
||||
if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard)
|
||||
focusManager.clearFocus(force = true)
|
||||
onRailSelect(key)
|
||||
}, a)
|
||||
CompositionLocalProvider(LocalShowSection provides { key -> selected = key }) {
|
||||
LauncherLayout(
|
||||
bottomNavigation, pal.line,
|
||||
Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() },
|
||||
bottomNavigation && !s.dualScreen, pal.line,
|
||||
Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() }
|
||||
.then(if (s.dualScreen) Modifier.onKeyEvent { event ->
|
||||
val step = dualPageStep(event.nativeKeyEvent) ?: return@onKeyEvent false
|
||||
if (event.type == KeyEventType.KeyDown && !processSettingsPageVisible) {
|
||||
val keys = navigationKeys(s)
|
||||
val at = keys.indexOf(railSelectionNow.value)
|
||||
keys.getOrNull(at + step)?.let { key ->
|
||||
PageSwipe.direction = step
|
||||
onRailSelect(key)
|
||||
}
|
||||
}
|
||||
true
|
||||
} else Modifier),
|
||||
navigation = {
|
||||
if (bottomNavigation) BottomBar(s, railSelection, onRailSelect, onRailFocus, a, railFocus)
|
||||
if (s.dualScreen) Unit
|
||||
else if (bottomNavigation) BottomBar(s, railSelection, onRailSelect, onRailFocus, a, railFocus)
|
||||
else SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight())
|
||||
},
|
||||
) {
|
||||
|
||||
@@ -421,6 +421,23 @@ internal fun SetupPanel(
|
||||
if (s.launcherFullscreen) stringResource(R.string.setup_fullscreen_on) else stringResource(R.string.setup_fullscreen_off),
|
||||
s.launcherFullscreen,
|
||||
) { a.onLauncherFullscreen(it) }
|
||||
if (s.dualScreenDevice) {
|
||||
ChoiceRow(
|
||||
host, "dual-screen", stringResource(R.string.setup_dual_screen), stringResource(R.string.setup_dual_screen_hint),
|
||||
listOf(
|
||||
com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto),
|
||||
com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on),
|
||||
com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off),
|
||||
),
|
||||
s.dualScreenMode, onPick = a.onDualScreenMode,
|
||||
)
|
||||
}
|
||||
if (s.dualScreenDevice && s.dualScreenMode != com.droiddeck.launcher.input.DualScreen.MODE_OFF) {
|
||||
ToggleRow(host, "dual-screen-menu", stringResource(R.string.setup_dual_screen_menu),
|
||||
stringResource(R.string.setup_dual_screen_menu_hint), s.dualScreenLauncher) { a.onDualScreenLauncher(it) }
|
||||
ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls),
|
||||
stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) }
|
||||
}
|
||||
}
|
||||
}
|
||||
val art: @Composable () -> Unit = {
|
||||
|
||||
@@ -31,11 +31,11 @@ internal fun LauncherLayout(
|
||||
}) { children, constraints ->
|
||||
val width = constraints.maxWidth
|
||||
val height = constraints.maxHeight
|
||||
val line = 1.dp.roundToPx()
|
||||
val nav = children[2].measure(Constraints(
|
||||
minWidth = if (bottomNavigation) width else 0, maxWidth = width,
|
||||
minHeight = if (bottomNavigation) 0 else height, maxHeight = height,
|
||||
))
|
||||
val line = if ((if (bottomNavigation) nav.height else nav.width) == 0) 0 else 1.dp.roundToPx()
|
||||
val contentWidth = if (bottomNavigation) width else (width - nav.width - line).coerceAtLeast(0)
|
||||
val contentHeight = if (bottomNavigation) (height - nav.height - line).coerceAtLeast(0) else height
|
||||
val pane = children[0].measure(Constraints.fixed(contentWidth, contentHeight))
|
||||
|
||||
@@ -6,6 +6,7 @@ import android.content.ClipboardManager
|
||||
import android.content.Context
|
||||
import android.graphics.Canvas
|
||||
import android.graphics.Color
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.view.Display
|
||||
@@ -15,6 +16,7 @@ import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.view.ViewConfiguration
|
||||
import android.view.WindowInsets
|
||||
import android.view.WindowManager
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import android.widget.Button
|
||||
@@ -22,6 +24,10 @@ import android.widget.FrameLayout
|
||||
import android.widget.HorizontalScrollView
|
||||
import android.widget.LinearLayout
|
||||
import android.widget.TextView
|
||||
import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
|
||||
import androidx.lifecycle.setViewTreeLifecycleOwner
|
||||
import androidx.lifecycle.setViewTreeViewModelStoreOwner
|
||||
import androidx.savedstate.setViewTreeSavedStateRegistryOwner
|
||||
import com.droiddeck.launcher.input.KeyboardHost
|
||||
import com.droiddeck.launcher.input.PadBridge
|
||||
import com.droiddeck.launcher.input.PointerGestures
|
||||
@@ -47,7 +53,14 @@ class SecondScreenPresentation(
|
||||
private val onQam: () -> Unit,
|
||||
private val onClose: () -> Unit,
|
||||
private val pad: PadBridge? = null,
|
||||
private val onKeyboardClosed: () -> Unit = {},
|
||||
private val onMenu: (() -> Unit)? = null,
|
||||
private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null,
|
||||
) : Presentation(sessionActivity, display) {
|
||||
private val frame = FrameLayout(context)
|
||||
private var menuView: androidx.compose.ui.platform.ComposeView? = null
|
||||
var menuShown = false
|
||||
private set
|
||||
private val root = LinearLayout(context).apply {
|
||||
orientation = LinearLayout.VERTICAL
|
||||
setBackgroundColor(Color.rgb(15, 18, 22))
|
||||
@@ -55,6 +68,10 @@ class SecondScreenPresentation(
|
||||
}
|
||||
private var currentMode = SecondScreenMode.NONE
|
||||
private var keyboardHost: KeyboardHost? = null
|
||||
private var keyboardButton: TextView? = null
|
||||
private var keyboardPending = false
|
||||
private var imeSeen = false
|
||||
private var fieldKeyboard = false
|
||||
private var terminalSession: TerminalSession? = null
|
||||
private var terminalView: TerminalView? = null
|
||||
private var terminalPid = -1
|
||||
@@ -73,18 +90,97 @@ class SecondScreenPresentation(
|
||||
created = true
|
||||
window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
||||
window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
|
||||
setContentView(root)
|
||||
frame.addView(root, FrameLayout.LayoutParams(-1, -1))
|
||||
setContentView(frame)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
||||
root.setOnApplyWindowInsetsListener { view, insets ->
|
||||
if (insets.isVisible(WindowInsets.Type.ime())) imeSeen = true
|
||||
else if (imeSeen) keyboardClosed()
|
||||
view.onApplyWindowInsets(insets)
|
||||
}
|
||||
}
|
||||
applyImmersiveMode()
|
||||
renderMode()
|
||||
}
|
||||
|
||||
fun requestKeyboard(forField: Boolean = false) {
|
||||
if (!showsKeyboard || keyboardHost == null) return
|
||||
if (forField) fieldKeyboard = true
|
||||
keyboardPending = true
|
||||
if (window?.decorView?.hasWindowFocus() == true) showPendingKeyboard()
|
||||
}
|
||||
|
||||
private fun showPendingKeyboard() {
|
||||
keyboardPending = false
|
||||
keyboardButton?.text = context.getString(R.string.second_hide_keyboard)
|
||||
for (delay in longArrayOf(150L, 450L)) root.postDelayed({
|
||||
val host = keyboardHost
|
||||
if (host != null && !imeSeen && showsKeyboard) host.show()
|
||||
}, delay)
|
||||
}
|
||||
|
||||
val fieldKeyboardOpen: Boolean get() = fieldKeyboard
|
||||
|
||||
fun closeFieldKeyboard() {
|
||||
if (!fieldKeyboard) return
|
||||
keyboardPending = false
|
||||
keyboardClosed()
|
||||
}
|
||||
|
||||
private fun keyboardClosed() {
|
||||
fieldKeyboard = false
|
||||
imeSeen = false
|
||||
keyboardHost?.takeIf { it.shown }?.hide()
|
||||
keyboardButton?.text = context.getString(R.string.second_show_keyboard)
|
||||
onKeyboardClosed()
|
||||
}
|
||||
|
||||
fun showMode(mode: SecondScreenMode) {
|
||||
if (currentMode == mode && isShowing) return
|
||||
currentMode = mode
|
||||
if (created) renderMode()
|
||||
}
|
||||
|
||||
val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.KEYBOARD_TRACKPAD
|
||||
|
||||
val showsControls: Boolean get() = isShowing && currentMode != SecondScreenMode.NONE
|
||||
|
||||
fun showMenu(on: Boolean) {
|
||||
if (on == menuShown) return
|
||||
val content = menu ?: return
|
||||
menuShown = on
|
||||
if (on) {
|
||||
keyboardHost?.takeIf { it.shown }?.hide()
|
||||
window?.decorView?.let { decor ->
|
||||
decor.setViewTreeLifecycleOwner(sessionActivity)
|
||||
decor.setViewTreeViewModelStoreOwner(sessionActivity)
|
||||
decor.setViewTreeSavedStateRegistryOwner(sessionActivity)
|
||||
decor.setViewTreeOnBackPressedDispatcherOwner(sessionActivity)
|
||||
}
|
||||
val view = menuView ?: androidx.compose.ui.platform.ComposeView(context).apply {
|
||||
isFocusable = true
|
||||
isFocusableInTouchMode = true
|
||||
defaultFocusHighlightEnabled = false
|
||||
setContent { content() }
|
||||
frame.addView(this, FrameLayout.LayoutParams(-1, -1))
|
||||
menuView = this
|
||||
}
|
||||
view.visibility = View.VISIBLE
|
||||
root.visibility = View.INVISIBLE
|
||||
view.requestFocus()
|
||||
} else {
|
||||
menuView?.let { frame.removeView(it); it.disposeComposition() }
|
||||
menuView = null
|
||||
root.visibility = View.VISIBLE
|
||||
}
|
||||
}
|
||||
|
||||
fun focusMenu(): Boolean = menuView?.requestFocus() == true
|
||||
|
||||
fun dispatchMenuKey(event: KeyEvent): Boolean = menuView?.dispatchKeyEvent(event) == true
|
||||
|
||||
fun closeControls() {
|
||||
showMenu(false)
|
||||
closeTerminal()
|
||||
keyboardHost?.hide()
|
||||
keyboardHost = null
|
||||
@@ -92,23 +188,31 @@ class SecondScreenPresentation(
|
||||
}
|
||||
|
||||
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
|
||||
if (currentMode == SecondScreenMode.KEYBOARD_TRACKPAD) {
|
||||
if (sessionActivity.dispatchKeyEvent(event)) return true
|
||||
}
|
||||
val forward = menuShown || currentMode != SecondScreenMode.TERMINAL || PadBridge.isControllerKeyEvent(event)
|
||||
if (forward && sessionActivity.dispatchKeyEvent(event)) return true
|
||||
return super.dispatchKeyEvent(event)
|
||||
}
|
||||
|
||||
override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
|
||||
if (PadBridge.isControllerMotionEvent(event) && sessionActivity.dispatchGenericMotionEvent(event)) return true
|
||||
return super.dispatchGenericMotionEvent(event)
|
||||
}
|
||||
|
||||
override fun onWindowFocusChanged(hasFocus: Boolean) {
|
||||
super.onWindowFocusChanged(hasFocus)
|
||||
if (hasFocus) {
|
||||
applyImmersiveMode()
|
||||
sessionActivity.refreshClipboard()
|
||||
if (keyboardPending) showPendingKeyboard()
|
||||
}
|
||||
}
|
||||
|
||||
private fun renderMode() {
|
||||
fieldKeyboard = false
|
||||
keyboardHost?.hide()
|
||||
keyboardHost = null
|
||||
keyboardButton = null
|
||||
keyboardPending = false
|
||||
closeTerminal()
|
||||
root.removeAllViews()
|
||||
val mode = if (currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad) SecondScreenMode.NONE
|
||||
@@ -118,7 +222,7 @@ class SecondScreenPresentation(
|
||||
when (mode) {
|
||||
SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad()
|
||||
SecondScreenMode.TERMINAL -> renderTerminal()
|
||||
SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad), weightParams())
|
||||
SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, onMenu = onMenu), weightParams())
|
||||
SecondScreenMode.NONE -> Unit
|
||||
}
|
||||
}
|
||||
@@ -129,49 +233,48 @@ class SecondScreenPresentation(
|
||||
val controls = LinearLayout(context).apply {
|
||||
gravity = Gravity.CENTER_VERTICAL
|
||||
orientation = LinearLayout.HORIZONTAL
|
||||
setPadding(dp(12), dp(8), dp(12), dp(8))
|
||||
setBackgroundColor(0xE6191E24.toInt())
|
||||
setPadding(dp(12), dp(10), dp(12), dp(6))
|
||||
setBackgroundColor(Color.BLACK)
|
||||
}
|
||||
controls.addView(Button(context).apply {
|
||||
text = "×"
|
||||
contentDescription = context.getString(R.string.deck_close)
|
||||
minWidth = dp(48)
|
||||
setOnClickListener { onClose() }
|
||||
})
|
||||
fun gap() = View(context).apply { layoutParams = LinearLayout.LayoutParams(dp(8), 1) }
|
||||
controls.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose))
|
||||
controls.addView(TextView(context).apply {
|
||||
text = context.getString(R.string.second_trackpad)
|
||||
textSize = 14f
|
||||
setTextColor(Color.WHITE)
|
||||
typeface = android.graphics.Typeface.create(android.graphics.Typeface.DEFAULT, android.graphics.Typeface.BOLD)
|
||||
setTextColor(Color.rgb(0x7A, 0x80, 0x8A))
|
||||
setPadding(dp(14), 0, dp(8), 0)
|
||||
isSingleLine = true
|
||||
}, LinearLayout.LayoutParams(0, -2, 1f))
|
||||
val keyboardButton = Button(context).apply {
|
||||
text = context.getString(R.string.second_show_keyboard)
|
||||
setOnClickListener {
|
||||
val host = keyboardHost ?: return@setOnClickListener
|
||||
if (host.shown) {
|
||||
host.hide()
|
||||
text = context.getString(R.string.second_show_keyboard)
|
||||
} else {
|
||||
host.show()
|
||||
text = context.getString(R.string.second_hide_keyboard)
|
||||
lateinit var keyboardButton: TextView
|
||||
keyboardButton = DeckControlsPanel.roundButton(context, context.getString(R.string.second_show_keyboard),
|
||||
context.getString(R.string.second_show_keyboard), {
|
||||
val host = keyboardHost
|
||||
if (host != null) {
|
||||
host.toggle()
|
||||
keyboardButton.text = context.getString(if (host.shown) R.string.second_hide_keyboard else R.string.second_show_keyboard)
|
||||
}
|
||||
}
|
||||
}
|
||||
}, wide = true)
|
||||
controls.addView(keyboardButton)
|
||||
this.keyboardButton = keyboardButton
|
||||
onMenu?.let {
|
||||
controls.addView(gap())
|
||||
controls.addView(DeckControlsPanel.menuButton(context, it))
|
||||
}
|
||||
if (SessionState.mode == SessionService.MODE_STEAM) {
|
||||
controls.addView(Button(context).apply {
|
||||
text = "STEAM"
|
||||
contentDescription = context.getString(R.string.deck_open_steam_menu)
|
||||
setOnClickListener { onSteamMenu() }
|
||||
})
|
||||
controls.addView(Button(context).apply {
|
||||
text = "…"
|
||||
contentDescription = context.getString(R.string.drawer_open_qam)
|
||||
setOnClickListener { onQam() }
|
||||
})
|
||||
controls.addView(gap())
|
||||
controls.addView(DeckControlsPanel.roundButton(context, "STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true))
|
||||
controls.addView(gap())
|
||||
controls.addView(DeckControlsPanel.roundButton(context, "•••", context.getString(R.string.drawer_open_qam), onQam, wide = true))
|
||||
}
|
||||
panel.addView(controls, FrameLayout.LayoutParams(-1, -2, Gravity.TOP))
|
||||
root.addView(panel, weightParams())
|
||||
val host = KeyboardHost(context) { sessionActivity.dispatchKeyEvent(it) }
|
||||
val host = KeyboardHost(context) { event ->
|
||||
val handled = sessionActivity.dispatchKeyEvent(event)
|
||||
if (fieldKeyboard && event.action == KeyEvent.ACTION_UP &&
|
||||
(event.keyCode == KeyEvent.KEYCODE_ENTER || event.keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)) root.post { closeFieldKeyboard() }
|
||||
handled
|
||||
}
|
||||
keyboardHost = host
|
||||
root.addView(host, ViewGroup.LayoutParams(1, 1))
|
||||
}
|
||||
@@ -329,8 +432,22 @@ class SecondScreenPresentation(
|
||||
if (oldw == 0 || oldh == 0) gestures.place(w / 2f, h / 2f)
|
||||
}
|
||||
|
||||
private val surface = android.graphics.RectF()
|
||||
private val fill = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(0x0A, 0x0B, 0x0D) }
|
||||
private val edge = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
|
||||
style = android.graphics.Paint.Style.STROKE
|
||||
color = Color.rgb(0x26, 0x29, 0x2E)
|
||||
strokeWidth = resources.displayMetrics.density
|
||||
}
|
||||
|
||||
override fun onDraw(canvas: Canvas) {
|
||||
canvas.drawColor(Color.BLACK)
|
||||
val inset = dp(12).toFloat()
|
||||
surface.set(inset, dp(72).toFloat(), width - inset, height - inset)
|
||||
if (surface.height() <= inset) return
|
||||
val radius = dp(20).toFloat()
|
||||
canvas.drawRoundRect(surface, radius, radius, fill)
|
||||
canvas.drawRoundRect(surface, radius, radius, edge)
|
||||
}
|
||||
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean = gestures.onTouch(event)
|
||||
|
||||
@@ -29,6 +29,9 @@ import androidx.compose.animation.core.FastOutSlowInEasing
|
||||
import androidx.compose.foundation.layout.offset
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.material.icons.outlined.Close
|
||||
import androidx.compose.material.icons.outlined.Terminal
|
||||
import androidx.compose.material.icons.outlined.Keyboard
|
||||
import androidx.compose.material.icons.outlined.AutoFixHigh
|
||||
import androidx.compose.material.icons.outlined.ExpandMore
|
||||
import androidx.compose.material.icons.outlined.Home
|
||||
@@ -323,7 +326,8 @@ class DrawerActions(
|
||||
|
||||
@OptIn(ExperimentalComposeUiApi::class)
|
||||
@Composable
|
||||
internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions) {
|
||||
internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions, docked: Boolean = false,
|
||||
backRequest: Int = 0, onLayerChange: (Boolean) -> Unit = {}) {
|
||||
val pages = sessionDrawerPages(a.secondScreenDisplays.isNotEmpty(), a.glassesPresent)
|
||||
val page = requestedPage.takeIf { it in pages } ?: SessionDrawerPage.CONTROLLER
|
||||
LaunchedEffect(requestedPage, pages) { if (page != requestedPage) onPageChange(page) }
|
||||
@@ -353,6 +357,18 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
if (host.open != null) host.open = null else a.onClose()
|
||||
}
|
||||
BackHandler(enabled = open && confirmStop) { confirmStop = false }
|
||||
val layerOpen = open && (host.open != null || appToChooseDisplay != null || confirmStop)
|
||||
LaunchedEffect(layerOpen) { onLayerChange(layerOpen) }
|
||||
var seenBackRequest by remember { mutableStateOf(backRequest) }
|
||||
LaunchedEffect(backRequest) {
|
||||
if (backRequest == seenBackRequest) return@LaunchedEffect
|
||||
seenBackRequest = backRequest
|
||||
when {
|
||||
confirmStop -> confirmStop = false
|
||||
appToChooseDisplay != null -> appToChooseDisplay = null
|
||||
host.open != null -> host.open = null
|
||||
}
|
||||
}
|
||||
LaunchedEffect(page) { host.open = null; appToChooseDisplay = null }
|
||||
LaunchedEffect(a.selectedGameProfileId) {
|
||||
if (host.open == "fex") host.open = null
|
||||
@@ -383,6 +399,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
val first = when {
|
||||
page == SessionDrawerPage.GLASSES -> "glasses-tab-$glassesTab"
|
||||
page == SessionDrawerPage.SESSION && a.isHomeApp -> "apps"
|
||||
page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:${a.secondScreenMode.id}"
|
||||
else -> page.firstControl
|
||||
}
|
||||
if (turned) focus.forget(page)
|
||||
@@ -394,9 +411,14 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
}
|
||||
focus.forget(page)
|
||||
focus.request(first)
|
||||
if (first != page.firstControl) repeat(4) {
|
||||
androidx.compose.runtime.withFrameNanos { }
|
||||
if (focus.focused == first) return@LaunchedEffect
|
||||
focus.request(page.firstControl)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (open || veil > 0.01f) {
|
||||
if (!docked && (open || veil > 0.01f)) {
|
||||
val closeLabel = stringResource(R.string.common_close)
|
||||
Box(
|
||||
modifier = Modifier.fillMaxSize()
|
||||
@@ -407,18 +429,18 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
}
|
||||
androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize().exposeTestTags(), contentAlignment = Alignment.CenterEnd) {
|
||||
val short = maxHeight < 440.dp
|
||||
val sheetWidth = minOf(360.dp, maxWidth * 0.92f)
|
||||
val sheetWidth = if (docked) maxWidth else minOf(360.dp, maxWidth * 0.92f)
|
||||
val narrow = sheetWidth < 320.dp
|
||||
AnimatedVisibility(
|
||||
open,
|
||||
enter = slideInHorizontally(Motion.sp(0.8f, Spring.StiffnessLow)) { it } + fadeIn(Motion.tw(220)),
|
||||
exit = slideOutHorizontally(Motion.tw(240)) { it } + fadeOut(Motion.tw(200)),
|
||||
enter = if (docked) fadeIn(Motion.tw(160)) else slideInHorizontally(Motion.sp(0.8f, Spring.StiffnessLow)) { it } + fadeIn(Motion.tw(220)),
|
||||
exit = if (docked) fadeOut(Motion.tw(140)) else slideOutHorizontally(Motion.tw(240)) { it } + fadeOut(Motion.tw(200)),
|
||||
) {
|
||||
FocusGlideHost(Modifier.fillMaxHeight().width(sheetWidth)) { Box(Modifier.fillMaxSize().onGloballyPositioned { sheetCoords = it }) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(pal.background.copy(alpha = 0.97f))
|
||||
.background(if (docked) pal.background else pal.background.copy(alpha = 0.97f))
|
||||
.blockTouches()
|
||||
.focusGroup()
|
||||
.controllerBack {
|
||||
@@ -431,6 +453,13 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||
modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp),
|
||||
) {
|
||||
if (docked) {
|
||||
SteamActionPill(
|
||||
stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"),
|
||||
) { host.open = null; a.onClose() }
|
||||
Spacer(Modifier.width(4.dp))
|
||||
BottomScreenModes(a, focus.track(page, "bottom-modes")) { host.open = null }
|
||||
}
|
||||
Spacer(Modifier.weight(1f))
|
||||
SteamActionPill(
|
||||
stringResource(R.string.stores_dl_pause), Icons.Outlined.Pause, focus.track(page, "pause"),
|
||||
@@ -817,6 +846,52 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun BottomScreenModes(a: DrawerActions, modifier: Modifier, onPick: () -> Unit) {
|
||||
val pal = LocalPalette.current
|
||||
val colors = MaterialTheme.colorScheme
|
||||
val modes = buildList {
|
||||
if (com.droiddeck.launcher.session.SessionState.deckPad) add(SecondScreenMode.DECK_CONTROLS to Icons.Outlined.SportsEsports)
|
||||
add(SecondScreenMode.KEYBOARD_TRACKPAD to Icons.Outlined.Keyboard)
|
||||
add(SecondScreenMode.TERMINAL to Icons.Outlined.Terminal)
|
||||
}
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp),
|
||||
modifier = modifier.focusGroup().clip(RoundedCornerShape(26.dp)).border(1.dp, pal.line, RoundedCornerShape(26.dp)).padding(4.dp),
|
||||
) {
|
||||
modes.forEach { (mode, icon) ->
|
||||
val selected = a.secondScreenMode == mode
|
||||
val source = remember { MutableInteractionSource() }
|
||||
val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value
|
||||
val shape = RoundedCornerShape(20.dp)
|
||||
val pick = { onPick(); a.onSecondScreenMode(mode) }
|
||||
val label = stringResource(mode.label)
|
||||
Box(
|
||||
contentAlignment = Alignment.Center,
|
||||
modifier = Modifier.size(width = 52.dp, height = 40.dp).semantics { contentDescription = label }
|
||||
.clip(shape)
|
||||
.background(when {
|
||||
selected -> pal.signal
|
||||
hot -> pal.signal.copy(alpha = 0.14f)
|
||||
else -> Color.Transparent
|
||||
})
|
||||
.glideBorder(hot, shape, pal.signal)
|
||||
.hoverable(source)
|
||||
.selectable(selected, interactionSource = source, indication = LocalIndication.current, role = Role.Tab, onClick = pick)
|
||||
.controllerConfirm(onClick = pick),
|
||||
) {
|
||||
Icon(icon, contentDescription = null, modifier = Modifier.size(22.dp),
|
||||
tint = when {
|
||||
selected -> colors.background
|
||||
hot -> pal.signal
|
||||
else -> colors.onBackground
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SteamActionPill(
|
||||
description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, modifier: Modifier,
|
||||
@@ -1648,6 +1723,13 @@ private fun StopConfirm(
|
||||
content = null
|
||||
}
|
||||
}
|
||||
LaunchedEffect(open, controllerActive) {
|
||||
if (!open || !controllerActive || stopFocused || cancelFocused) return@LaunchedEffect
|
||||
delay(Motion.ms(300).toLong())
|
||||
withFrameNanos { }
|
||||
if (stopFocused || cancelFocused) return@LaunchedEffect
|
||||
runCatching { cancelFocus.requestFocus() }
|
||||
}
|
||||
val p = pill ?: return
|
||||
|
||||
Box(Modifier.fillMaxSize()) {
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.ActivityManager
|
||||
import android.app.ActivityOptions
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
|
||||
object SessionTyping {
|
||||
private var activity: SessionTypingActivity? = null
|
||||
private var launching = false
|
||||
|
||||
fun focusDisplay(context: Context, displayId: Int) {
|
||||
if (activity != null || launching) return
|
||||
launching = true
|
||||
val intent = Intent(context, SessionTypingActivity::class.java)
|
||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION)
|
||||
runCatching {
|
||||
context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle())
|
||||
}.onFailure { launching = false }
|
||||
}
|
||||
|
||||
fun returnFocus(context: Context, task: Int) {
|
||||
close()
|
||||
if (task < 0) return
|
||||
runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).moveTaskToFront(task, 0) }
|
||||
}
|
||||
|
||||
fun close() {
|
||||
launching = false
|
||||
activity?.finish()
|
||||
activity = null
|
||||
}
|
||||
|
||||
internal fun attach(host: SessionTypingActivity): Boolean {
|
||||
if (!launching) return false
|
||||
launching = false
|
||||
activity = host
|
||||
return true
|
||||
}
|
||||
|
||||
internal fun detach(host: SessionTypingActivity) {
|
||||
if (activity === host) activity = null
|
||||
}
|
||||
}
|
||||
|
||||
class SessionTypingActivity : Activity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
if (!SessionTyping.attach(this)) finish()
|
||||
}
|
||||
|
||||
override fun onStop() {
|
||||
super.onStop()
|
||||
if (!isFinishing) finish()
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
SessionTyping.detach(this)
|
||||
super.onDestroy()
|
||||
}
|
||||
}
|
||||
@@ -201,7 +201,7 @@ internal fun IntegrationSuggestion(state: SteamIntegration.State, onOpen: () ->
|
||||
}
|
||||
val closeSrc = remember { MutableInteractionSource() }
|
||||
val closeHot = rememberHot(closeSrc)
|
||||
val later = stringResource(R.string.integration_later)
|
||||
val later = stringResource(R.string.common_close)
|
||||
Box(
|
||||
contentAlignment = Alignment.Center,
|
||||
modifier = Modifier.padding(end = 4.dp).size(32.dp).clip(CircleShape)
|
||||
|
||||
@@ -253,13 +253,17 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier
|
||||
val ids = tabs.filter { it.shown }.map { it.store.id }
|
||||
if (ids.isEmpty()) return
|
||||
val at = ids.indexOf(chip)
|
||||
pickChip(ids[if (at < 0) (if (step > 0) 0 else ids.size - 1) else (at + step + ids.size) % ids.size])
|
||||
val id = ids[if (at < 0) (if (step > 0) 0 else ids.size - 1) else (at + step + ids.size) % ids.size]
|
||||
chip = id; openGame = null; query = ""
|
||||
move("item:storechip:$id")
|
||||
}
|
||||
fun openModes(st: Store) {
|
||||
if (chip != st.id) pickChip(st.id) else move("first")
|
||||
}
|
||||
BackHandler(enabled = openGame != null) { closeGame() }
|
||||
BackHandler(enabled = arranging) { arranging = false }
|
||||
var contentFocused by remember { mutableStateOf(false) }
|
||||
BackHandler(enabled = contentFocused && openGame == null && !arranging) { move("item:storechip:$chip") }
|
||||
LaunchedEffect(arranging) {
|
||||
val focus = ff ?: return@LaunchedEffect
|
||||
if (!arranging || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect
|
||||
@@ -348,7 +352,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier
|
||||
else scroll.value > 0
|
||||
},
|
||||
onDetailFocus = { detailFocused = it },
|
||||
modifier = Modifier.fillMaxWidth().weight(1f).onSizeChanged { viewportH = with(density) { it.height.toDp() } },
|
||||
modifier = Modifier.fillMaxWidth().weight(1f).onFocusChanged { contentFocused = it.hasFocus }.onSizeChanged { viewportH = with(density) { it.height.toDp() } },
|
||||
bleedHorizontal = padH,
|
||||
wrap = { key, content -> StoreTheme(Store.byId(key.substringBefore(':')) ?: store) { content() } },
|
||||
grid = {
|
||||
|
||||
@@ -28,6 +28,7 @@ import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberUpdatedState
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
@@ -40,10 +41,13 @@ import androidx.compose.ui.graphics.toArgb
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalFocusManager
|
||||
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
|
||||
import androidx.compose.ui.text.TextRange
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.text.input.ImeOptions
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.TextFieldValue
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.viewinterop.AndroidView
|
||||
import com.droiddeck.launcher.core.PhantomProcessLimit
|
||||
@@ -373,6 +377,31 @@ internal fun AdbTextField(
|
||||
val shape = RoundedCornerShape(8.dp)
|
||||
val inputHeight = if (compact) 44.dp else 52.dp
|
||||
val colors = MaterialTheme.colorScheme
|
||||
val bottomTyping = LocalBottomTyping.current
|
||||
val bottomTypingLatest = rememberUpdatedState(bottomTyping)
|
||||
val typingRequest = remember { arrayOfNulls<TypingRequest>(1) }
|
||||
|
||||
fun typeOnBottom(editText: EditText): Boolean {
|
||||
if (!bottomTypingLatest.value || !DualScreenPanel.attached) return false
|
||||
val text = editText.text.toString()
|
||||
val request = TypingRequest(
|
||||
TextFieldValue(text, TextRange(editText.selectionStart.coerceIn(0, text.length), editText.selectionEnd.coerceIn(0, text.length))),
|
||||
ImeOptions(singleLine = true, keyboardType = keyboardType, imeAction = imeAction),
|
||||
{ next ->
|
||||
if (editText.text.toString() != next.text) editText.setText(next.text)
|
||||
editText.setSelection(next.selection.start.coerceIn(0, next.text.length), next.selection.end.coerceIn(0, next.text.length))
|
||||
},
|
||||
{ action -> editText.onEditorAction(imeActionFlag(action)) },
|
||||
{ editText.post { editText.clearFocus() } },
|
||||
)
|
||||
typingRequest[0] = request
|
||||
DualScreenPanel.startTyping(request)
|
||||
return true
|
||||
}
|
||||
|
||||
DisposableEffect(Unit) {
|
||||
onDispose { typingRequest[0]?.let { DualScreenPanel.stopTyping(it) } }
|
||||
}
|
||||
|
||||
Column(modifier = modifier.fillMaxWidth()) {
|
||||
if (showLabel) Text(
|
||||
@@ -424,8 +453,12 @@ internal fun AdbTextField(
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
showSoftInputOnFocus = !bottomTyping
|
||||
setOnClickListener { if (hasFocus() && !typeOnBottom(this) && bottomTypingLatest.value) showKeyboardHere(this) }
|
||||
setOnFocusChangeListener { _, hasFocus ->
|
||||
focused = hasFocus
|
||||
if (hasFocus) { if (!typeOnBottom(this) && bottomTypingLatest.value) showKeyboardHere(this) }
|
||||
else typingRequest[0]?.let { DualScreenPanel.stopTyping(it) }
|
||||
onFocusChangeLatest.value(hasFocus)
|
||||
}
|
||||
addTextChangedListener(object : TextWatcher {
|
||||
@@ -438,11 +471,12 @@ internal fun AdbTextField(
|
||||
}
|
||||
},
|
||||
update = { editText ->
|
||||
editText.showSoftInputOnFocus = !bottomTyping
|
||||
if (focusOnShow && !focusAsked[0]) {
|
||||
focusAsked[0] = true
|
||||
editText.post {
|
||||
editText.requestFocus()
|
||||
(editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
|
||||
if (!bottomTypingLatest.value) (editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
|
||||
?.showSoftInput(editText, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT)
|
||||
}
|
||||
}
|
||||
@@ -548,6 +582,11 @@ private fun parseAdbAddress(value: String): AdbEndpoint? {
|
||||
private fun formatAddressHost(host: String): String = if (':' in host) "[$host]" else host
|
||||
private fun formatAdbAddress(host: String, port: Int): String = "${formatAddressHost(host)}:$port"
|
||||
|
||||
private fun showKeyboardHere(editText: EditText) {
|
||||
(editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
|
||||
?.showSoftInput(editText, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT)
|
||||
}
|
||||
|
||||
private fun imeActionFlag(action: ImeAction): Int = when (action) {
|
||||
ImeAction.Next -> EditorInfo.IME_ACTION_NEXT
|
||||
ImeAction.Done -> EditorInfo.IME_ACTION_DONE
|
||||
|
||||
@@ -840,6 +840,17 @@
|
||||
<string name="setup_fullscreen">ملء الشاشة</string>
|
||||
<string name="setup_fullscreen_on">يخفي شريطي الحالة والتنقّل في Android</string>
|
||||
<string name="setup_fullscreen_off">يعرض شريطي الحالة والتنقّل في Android</string>
|
||||
<string name="setup_dual_screen">الشاشة المزدوجة</string>
|
||||
<string name="setup_dual_screen_hint">يستخدم الوضع التلقائي الشاشة الثانية في الأجهزة المحمولة التي تحتوي على شاشة مدمجة. يستخدم وضع التشغيل أي شاشة ثانية. يُبقي وضع الإيقاف كل شيء على شاشة واحدة.</string>
|
||||
<string name="setup_dual_screen_auto">تلقائي</string>
|
||||
<string name="setup_dual_screen_on">تشغيل</string>
|
||||
<string name="setup_dual_screen_off">إيقاف</string>
|
||||
<string name="setup_dual_screen_menu">قائمة الشاشة السفلية</string>
|
||||
<string name="setup_dual_screen_menu_hint">ينقل الأقسام وقائمة اللعبة إلى الشاشة الثانية ويتم الكتابة هناك، لتبقى الشاشة العلوية بعرضها الكامل. يبدّل L2 وR2 بين الأقسام.</string>
|
||||
<string name="setup_dual_screen_controls">عناصر تحكم الشاشة السفلية في الألعاب</string>
|
||||
<string name="setup_dual_screen_controls_hint">يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة.</string>
|
||||
<string name="dual_typing_title">الكتابة على الشاشة العلوية</string>
|
||||
<string name="dual_typing_done">تم</string>
|
||||
<string name="setup_default_home">تطبيق الشاشة الرئيسية الافتراضي</string>
|
||||
<string name="setup_choose_home">اختيار تطبيق للشاشة الرئيسية</string>
|
||||
<string name="setup_choose">اختيار</string>
|
||||
|
||||
@@ -851,6 +851,17 @@
|
||||
<string name="setup_fullscreen">Pantalla completa</string>
|
||||
<string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string>
|
||||
<string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string>
|
||||
<string name="setup_dual_screen">Pantalla dual</string>
|
||||
<string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la traen integrada. Activado usa cualquier segunda pantalla. Desactivado deja todo en una sola pantalla.</string>
|
||||
<string name="setup_dual_screen_auto">Automático</string>
|
||||
<string name="setup_dual_screen_on">Activado</string>
|
||||
<string name="setup_dual_screen_off">Desactivado</string>
|
||||
<string name="setup_dual_screen_menu">Menú en la pantalla inferior</string>
|
||||
<string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y escribe ahí, para que la pantalla superior conserve la vista completa. L2 y R2 cambian de sección.</string>
|
||||
<string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string>
|
||||
<string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión.</string>
|
||||
<string name="dual_typing_title">Escribiendo en la pantalla superior</string>
|
||||
<string name="dual_typing_done">Listo</string>
|
||||
<string name="setup_default_home">App de inicio predeterminada</string>
|
||||
<string name="setup_choose_home">Elige una app de inicio</string>
|
||||
<string name="setup_choose">Elegir</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Цял екран</string>
|
||||
<string name="setup_fullscreen_on">Скрива лентите за състояние и навигация на Android</string>
|
||||
<string name="setup_fullscreen_off">Показва лентите за състояние и навигация на Android</string>
|
||||
<string name="setup_dual_screen">Двоен екран</string>
|
||||
<string name="setup_dual_screen_hint">Автоматично използва втория екран на преносими устройства с вграден такъв. Вкл. използва всеки втори дисплей. Изкл. държи всичко на един екран.</string>
|
||||
<string name="setup_dual_screen_auto">Автоматично</string>
|
||||
<string name="setup_dual_screen_on">Вкл.</string>
|
||||
<string name="setup_dual_screen_off">Изкл.</string>
|
||||
<string name="setup_dual_screen_menu">Меню на долния екран</string>
|
||||
<string name="setup_dual_screen_menu_hint">Премества секциите и менюто по време на игра на втория екран и въвеждането става там, така горният екран остава с пълен изглед. L2 и R2 сменят секциите.</string>
|
||||
<string name="setup_dual_screen_controls">Контроли на долния екран в игрите</string>
|
||||
<string name="setup_dual_screen_controls_hint">Отваря тракпада и клавиатурата на втория екран при стартиране на сесия.</string>
|
||||
<string name="dual_typing_title">Въвеждане за горния екран</string>
|
||||
<string name="dual_typing_done">Готово</string>
|
||||
<string name="setup_default_home">Приложение за начален екран по подразбиране</string>
|
||||
<string name="setup_choose_home">Изберете приложение за начален екран</string>
|
||||
<string name="setup_choose">Избор</string>
|
||||
|
||||
@@ -834,6 +834,17 @@
|
||||
<string name="setup_fullscreen">Celá obrazovka</string>
|
||||
<string name="setup_fullscreen_on">Skryje stavový a navigační panel Androidu</string>
|
||||
<string name="setup_fullscreen_off">Zobrazí stavový a navigační panel Androidu</string>
|
||||
<string name="setup_dual_screen">Dvě obrazovky</string>
|
||||
<string name="setup_dual_screen_hint">Automaticky používá druhou obrazovku na kapesních zařízeních, která ji mají vestavěnou. Zapnuto používá jakýkoli druhý displej. Vypnuto nechá vše na jedné obrazovce.</string>
|
||||
<string name="setup_dual_screen_auto">Automaticky</string>
|
||||
<string name="setup_dual_screen_on">Zapnuto</string>
|
||||
<string name="setup_dual_screen_off">Vypnuto</string>
|
||||
<string name="setup_dual_screen_menu">Nabídka na spodní obrazovce</string>
|
||||
<string name="setup_dual_screen_menu_hint">Přesune sekce a herní nabídku na druhou obrazovku a píše se tam, takže horní obrazovka zůstane celá volná. L2 a R2 přepínají sekce.</string>
|
||||
<string name="setup_dual_screen_controls">Ovládání na spodní obrazovce ve hrách</string>
|
||||
<string name="setup_dual_screen_controls_hint">Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce.</string>
|
||||
<string name="dual_typing_title">Psaní pro horní obrazovku</string>
|
||||
<string name="dual_typing_done">Hotovo</string>
|
||||
<string name="setup_default_home">Výchozí domovská aplikace</string>
|
||||
<string name="setup_choose_home">Vybrat domovskou aplikaci</string>
|
||||
<string name="setup_choose">Vybrat</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Fuldskærm</string>
|
||||
<string name="setup_fullscreen_on">Skjuler Androids status- og navigationsbjælker</string>
|
||||
<string name="setup_fullscreen_off">Viser Androids status- og navigationsbjælker</string>
|
||||
<string name="setup_dual_screen">Dobbeltskærm</string>
|
||||
<string name="setup_dual_screen_hint">Automatisk bruger den anden skærm på håndholdte enheder med en indbygget ekstra skærm. Til bruger enhver anden skærm. Fra holder alt på én skærm.</string>
|
||||
<string name="setup_dual_screen_auto">Automatisk</string>
|
||||
<string name="setup_dual_screen_on">Til</string>
|
||||
<string name="setup_dual_screen_off">Fra</string>
|
||||
<string name="setup_dual_screen_menu">Menu på nederste skærm</string>
|
||||
<string name="setup_dual_screen_menu_hint">Flytter sektionerne og menuen i spillet til den anden skærm og skriver der, så den øverste skærm beholder hele visningen. L2 og R2 skifter sektion.</string>
|
||||
<string name="setup_dual_screen_controls">Kontroller på nederste skærm i spil</string>
|
||||
<string name="setup_dual_screen_controls_hint">Åbner pegefeltet og tastaturet på den anden skærm, når en session starter.</string>
|
||||
<string name="dual_typing_title">Skriver til den øverste skærm</string>
|
||||
<string name="dual_typing_done">Færdig</string>
|
||||
<string name="setup_default_home">Standard Home-app</string>
|
||||
<string name="setup_choose_home">Vælg en Home-app</string>
|
||||
<string name="setup_choose">Vælg</string>
|
||||
|
||||
@@ -820,6 +820,17 @@
|
||||
<string name="setup_fullscreen">Vollbild</string>
|
||||
<string name="setup_fullscreen_on">Blendet die Status- und Navigationsleiste von Android aus</string>
|
||||
<string name="setup_fullscreen_off">Zeigt die Status- und Navigationsleiste von Android an</string>
|
||||
<string name="setup_dual_screen">Zwei Bildschirme</string>
|
||||
<string name="setup_dual_screen_hint">Automatisch nutzt den zweiten Bildschirm auf Handhelds mit eingebautem Zweitbildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus lässt alles auf einem Bildschirm.</string>
|
||||
<string name="setup_dual_screen_auto">Automatisch</string>
|
||||
<string name="setup_dual_screen_on">Ein</string>
|
||||
<string name="setup_dual_screen_off">Aus</string>
|
||||
<string name="setup_dual_screen_menu">Menü auf dem unteren Bildschirm</string>
|
||||
<string name="setup_dual_screen_menu_hint">Verschiebt die Bereiche und das Menü im Spiel auf den zweiten Bildschirm und tippt dort, damit der obere Bildschirm die volle Ansicht behält. L2 und R2 wechseln den Bereich.</string>
|
||||
<string name="setup_dual_screen_controls">Steuerung auf dem unteren Bildschirm in Spielen</string>
|
||||
<string name="setup_dual_screen_controls_hint">Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm.</string>
|
||||
<string name="dual_typing_title">Eingabe für den oberen Bildschirm</string>
|
||||
<string name="dual_typing_done">Fertig</string>
|
||||
<string name="setup_default_home">Standard-Startbildschirm-App</string>
|
||||
<string name="setup_choose_home">Startbildschirm-App auswählen</string>
|
||||
<string name="setup_choose">Auswählen</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Πλήρης οθόνη</string>
|
||||
<string name="setup_fullscreen_on">Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android</string>
|
||||
<string name="setup_fullscreen_off">Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android</string>
|
||||
<string name="setup_dual_screen">Διπλή οθόνη</string>
|
||||
<string name="setup_dual_screen_hint">Το Αυτόματο χρησιμοποιεί τη δεύτερη οθόνη σε φορητές συσκευές με ενσωματωμένη. Το Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Το Ανενεργό κρατά τα πάντα σε μία οθόνη.</string>
|
||||
<string name="setup_dual_screen_auto">Αυτόματο</string>
|
||||
<string name="setup_dual_screen_on">Ενεργό</string>
|
||||
<string name="setup_dual_screen_off">Ανενεργό</string>
|
||||
<string name="setup_dual_screen_menu">Μενού κάτω οθόνης</string>
|
||||
<string name="setup_dual_screen_menu_hint">Μεταφέρει τις ενότητες και το μενού του παιχνιδιού στη δεύτερη οθόνη και η πληκτρολόγηση γίνεται εκεί, ώστε η πάνω οθόνη να κρατά την πλήρη προβολή. Τα L2 και R2 αλλάζουν ενότητα.</string>
|
||||
<string name="setup_dual_screen_controls">Χειριστήρια κάτω οθόνης στα παιχνίδια</string>
|
||||
<string name="setup_dual_screen_controls_hint">Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία.</string>
|
||||
<string name="dual_typing_title">Πληκτρολόγηση για την πάνω οθόνη</string>
|
||||
<string name="dual_typing_done">Τέλος</string>
|
||||
<string name="setup_default_home">Προεπιλεγμένη εφαρμογή αρχικής οθόνης</string>
|
||||
<string name="setup_choose_home">Επιλογή εφαρμογής αρχικής οθόνης</string>
|
||||
<string name="setup_choose">Επιλογή</string>
|
||||
|
||||
@@ -833,6 +833,17 @@
|
||||
<string name="setup_fullscreen">Pantalla completa</string>
|
||||
<string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string>
|
||||
<string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string>
|
||||
<string name="setup_dual_screen">Pantalla doble</string>
|
||||
<string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la llevan integrada. Activado usa cualquier segunda pantalla. Desactivado lo mantiene todo en una pantalla.</string>
|
||||
<string name="setup_dual_screen_auto">Automático</string>
|
||||
<string name="setup_dual_screen_on">Activado</string>
|
||||
<string name="setup_dual_screen_off">Desactivado</string>
|
||||
<string name="setup_dual_screen_menu">Menú en la pantalla inferior</string>
|
||||
<string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y se escribe allí, para que la pantalla superior mantenga la vista completa. L2 y R2 cambian de sección.</string>
|
||||
<string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string>
|
||||
<string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión.</string>
|
||||
<string name="dual_typing_title">Escribiendo en la pantalla superior</string>
|
||||
<string name="dual_typing_done">Hecho</string>
|
||||
<string name="setup_default_home">App de inicio predeterminada</string>
|
||||
<string name="setup_choose_home">Elige una app de inicio</string>
|
||||
<string name="setup_choose">Elegir</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Koko näyttö</string>
|
||||
<string name="setup_fullscreen_on">Piilottaa Androidin tila- ja navigointipalkit</string>
|
||||
<string name="setup_fullscreen_off">Näyttää Androidin tila- ja navigointipalkit</string>
|
||||
<string name="setup_dual_screen">Kaksi näyttöä</string>
|
||||
<string name="setup_dual_screen_hint">Automaattinen käyttää toista näyttöä kämmenlaitteissa, joissa sellainen on sisäänrakennettuna. Päällä käyttää mitä tahansa toista näyttöä. Pois pitää kaiken yhdellä näytöllä.</string>
|
||||
<string name="setup_dual_screen_auto">Automaattinen</string>
|
||||
<string name="setup_dual_screen_on">Päällä</string>
|
||||
<string name="setup_dual_screen_off">Pois</string>
|
||||
<string name="setup_dual_screen_menu">Alanäytön valikko</string>
|
||||
<string name="setup_dual_screen_menu_hint">Siirtää osiot ja pelin aikaisen valikon toiselle näytölle ja kirjoitus tehdään siellä, joten yläruutu säilyttää koko näkymän. L2 ja R2 vaihtavat osiota.</string>
|
||||
<string name="setup_dual_screen_controls">Alanäytön ohjaimet peleissä</string>
|
||||
<string name="setup_dual_screen_controls_hint">Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa.</string>
|
||||
<string name="dual_typing_title">Kirjoitus yläruudulle</string>
|
||||
<string name="dual_typing_done">Valmis</string>
|
||||
<string name="setup_default_home">Oletuskotisovellus</string>
|
||||
<string name="setup_choose_home">Valitse kotisovellus</string>
|
||||
<string name="setup_choose">Valitse</string>
|
||||
|
||||
@@ -833,6 +833,17 @@
|
||||
<string name="setup_fullscreen">Plein écran</string>
|
||||
<string name="setup_fullscreen_on">Masquer la barre d\'état et la barre de navigation Android</string>
|
||||
<string name="setup_fullscreen_off">Afficher la barre d\'état et la barre de navigation Android</string>
|
||||
<string name="setup_dual_screen">Double écran</string>
|
||||
<string name="setup_dual_screen_hint">Automatique utilise le second écran sur les consoles portables qui en ont un intégré. Activé utilise n\'importe quel second écran. Désactivé garde tout sur un seul écran.</string>
|
||||
<string name="setup_dual_screen_auto">Automatique</string>
|
||||
<string name="setup_dual_screen_on">Activé</string>
|
||||
<string name="setup_dual_screen_off">Désactivé</string>
|
||||
<string name="setup_dual_screen_menu">Menu sur l\'écran du bas</string>
|
||||
<string name="setup_dual_screen_menu_hint">Déplace les sections et le menu en jeu sur le second écran et la saisie s\'y fait, pour que l\'écran du haut garde toute la vue. L2 et R2 changent de section.</string>
|
||||
<string name="setup_dual_screen_controls">Commandes sur l\'écran du bas en jeu</string>
|
||||
<string name="setup_dual_screen_controls_hint">Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session.</string>
|
||||
<string name="dual_typing_title">Saisie pour l\'écran du haut</string>
|
||||
<string name="dual_typing_done">Terminé</string>
|
||||
<string name="setup_default_home">Application d\'écran d\'accueil par défaut</string>
|
||||
<string name="setup_choose_home">Choisir l\'application d\'écran d\'accueil</string>
|
||||
<string name="setup_choose">Choisir</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">फ़ुलस्क्रीन</string>
|
||||
<string name="setup_fullscreen_on">Android स्टेटस और नेविगेशन बार छिपाता है</string>
|
||||
<string name="setup_fullscreen_off">Android स्टेटस और नेविगेशन बार दिखाता है</string>
|
||||
<string name="setup_dual_screen">डुअल स्क्रीन</string>
|
||||
<string name="setup_dual_screen_hint">ऑटोमैटिक, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड पर दूसरी स्क्रीन इस्तेमाल करता है। चालू किसी भी दूसरे डिस्प्ले का इस्तेमाल करता है। बंद सब कुछ एक स्क्रीन पर रखता है।</string>
|
||||
<string name="setup_dual_screen_auto">ऑटोमैटिक</string>
|
||||
<string name="setup_dual_screen_on">चालू</string>
|
||||
<string name="setup_dual_screen_off">बंद</string>
|
||||
<string name="setup_dual_screen_menu">नीचे की स्क्रीन पर मेनू</string>
|
||||
<string name="setup_dual_screen_menu_hint">सेक्शन और गेम के दौरान का मेनू दूसरी स्क्रीन पर ले जाता है और टाइपिंग वहीं होती है, ताकि ऊपर की स्क्रीन पूरा दृश्य दिखाए। L2 और R2 सेक्शन बदलते हैं।</string>
|
||||
<string name="setup_dual_screen_controls">गेम में नीचे की स्क्रीन के कंट्रोल</string>
|
||||
<string name="setup_dual_screen_controls_hint">सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है।</string>
|
||||
<string name="dual_typing_title">ऊपर की स्क्रीन के लिए टाइपिंग</string>
|
||||
<string name="dual_typing_done">हो गया</string>
|
||||
<string name="setup_default_home">डिफ़ॉल्ट होम ऐप</string>
|
||||
<string name="setup_choose_home">होम ऐप चुनें</string>
|
||||
<string name="setup_choose">चुनें</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Teljes képernyő</string>
|
||||
<string name="setup_fullscreen_on">Elrejti az Android állapot- és navigációs sávokat</string>
|
||||
<string name="setup_fullscreen_off">Megjeleníti az Android állapot- és navigációs sávokat</string>
|
||||
<string name="setup_dual_screen">Két képernyő</string>
|
||||
<string name="setup_dual_screen_hint">Az Automatikus a beépített második képernyővel rendelkező kézikonzolokon használja a második képernyőt. A Be bármilyen második kijelzőt használ. A Ki mindent egy képernyőn tart.</string>
|
||||
<string name="setup_dual_screen_auto">Automatikus</string>
|
||||
<string name="setup_dual_screen_on">Be</string>
|
||||
<string name="setup_dual_screen_off">Ki</string>
|
||||
<string name="setup_dual_screen_menu">Menü az alsó képernyőn</string>
|
||||
<string name="setup_dual_screen_menu_hint">A szakaszokat és a játék közbeni menüt a második képernyőre helyezi, és ott történik a gépelés, így a felső képernyő teljes nézetet kap. Az L2 és R2 vált szakaszt.</string>
|
||||
<string name="setup_dual_screen_controls">Alsó képernyős vezérlők játékokban</string>
|
||||
<string name="setup_dual_screen_controls_hint">Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn.</string>
|
||||
<string name="dual_typing_title">Gépelés a felső képernyőre</string>
|
||||
<string name="dual_typing_done">Kész</string>
|
||||
<string name="setup_default_home">Alapértelmezett kezdőképernyő alkalmazás</string>
|
||||
<string name="setup_choose_home">Válasszon kezdőképernyő alkalmazást</string>
|
||||
<string name="setup_choose">Kiválasztás</string>
|
||||
|
||||
@@ -825,6 +825,17 @@
|
||||
<string name="setup_fullscreen">Layar penuh</string>
|
||||
<string name="setup_fullscreen_on">Menyembunyikan bilah status dan navigasi Android</string>
|
||||
<string name="setup_fullscreen_off">Menampilkan bilah status dan navigasi Android</string>
|
||||
<string name="setup_dual_screen">Layar ganda</string>
|
||||
<string name="setup_dual_screen_hint">Otomatis memakai layar kedua pada perangkat genggam yang memiliki layar bawaan. Aktif memakai layar kedua apa pun. Nonaktif membuat semuanya tetap di satu layar.</string>
|
||||
<string name="setup_dual_screen_auto">Otomatis</string>
|
||||
<string name="setup_dual_screen_on">Aktif</string>
|
||||
<string name="setup_dual_screen_off">Nonaktif</string>
|
||||
<string name="setup_dual_screen_menu">Menu layar bawah</string>
|
||||
<string name="setup_dual_screen_menu_hint">Memindahkan bagian dan menu dalam game ke layar kedua dan mengetik di sana, agar layar atas tetap menampilkan tampilan penuh. L2 dan R2 berpindah bagian.</string>
|
||||
<string name="setup_dual_screen_controls">Kontrol layar bawah dalam game</string>
|
||||
<string name="setup_dual_screen_controls_hint">Membuka trackpad dan keyboard di layar kedua saat sesi dimulai.</string>
|
||||
<string name="dual_typing_title">Mengetik untuk layar atas</string>
|
||||
<string name="dual_typing_done">Selesai</string>
|
||||
<string name="setup_default_home">Aplikasi Utama default</string>
|
||||
<string name="setup_choose_home">Pilih aplikasi Utama</string>
|
||||
<string name="setup_choose">Pilih</string>
|
||||
|
||||
@@ -823,6 +823,17 @@
|
||||
<string name="setup_fullscreen">Schermo intero</string>
|
||||
<string name="setup_fullscreen_on">Nasconde la barra di stato e la barra di navigazione di Android</string>
|
||||
<string name="setup_fullscreen_off">Mostra la barra di stato e la barra di navigazione di Android</string>
|
||||
<string name="setup_dual_screen">Doppio schermo</string>
|
||||
<string name="setup_dual_screen_hint">Automatico usa il secondo schermo sulle console portatili che ne hanno uno integrato. Attivo usa qualsiasi secondo schermo. Disattivo tiene tutto su un solo schermo.</string>
|
||||
<string name="setup_dual_screen_auto">Automatico</string>
|
||||
<string name="setup_dual_screen_on">Attivo</string>
|
||||
<string name="setup_dual_screen_off">Disattivo</string>
|
||||
<string name="setup_dual_screen_menu">Menu sullo schermo inferiore</string>
|
||||
<string name="setup_dual_screen_menu_hint">Sposta le sezioni e il menu di gioco sul secondo schermo e si digita lì, così lo schermo superiore mantiene la vista completa. L2 e R2 cambiano sezione.</string>
|
||||
<string name="setup_dual_screen_controls">Controlli sullo schermo inferiore nei giochi</string>
|
||||
<string name="setup_dual_screen_controls_hint">Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione.</string>
|
||||
<string name="dual_typing_title">Digitazione per lo schermo superiore</string>
|
||||
<string name="dual_typing_done">Fine</string>
|
||||
<string name="setup_default_home">App Home predefinita</string>
|
||||
<string name="setup_choose_home">Scegli un\'app Home</string>
|
||||
<string name="setup_choose">Scegli</string>
|
||||
|
||||
@@ -827,6 +827,17 @@
|
||||
<string name="setup_fullscreen">全画面</string>
|
||||
<string name="setup_fullscreen_on">Androidのステータスバーとナビゲーションバーを非表示</string>
|
||||
<string name="setup_fullscreen_off">Androidのステータスバーとナビゲーションバーを表示</string>
|
||||
<string name="setup_dual_screen">デュアル画面</string>
|
||||
<string name="setup_dual_screen_hint">自動では、2画面目を内蔵した携帯機でその画面を使います。オンではどの2画面目でも使います。オフではすべてを1画面に表示します。</string>
|
||||
<string name="setup_dual_screen_auto">自動</string>
|
||||
<string name="setup_dual_screen_on">オン</string>
|
||||
<string name="setup_dual_screen_off">オフ</string>
|
||||
<string name="setup_dual_screen_menu">下画面メニュー</string>
|
||||
<string name="setup_dual_screen_menu_hint">セクションとゲーム中のメニューを2画面目に移し、入力もそこで行うため、上画面は全体表示のままになります。L2とR2でセクションを切り替えます。</string>
|
||||
<string name="setup_dual_screen_controls">ゲーム中の下画面コントロール</string>
|
||||
<string name="setup_dual_screen_controls_hint">セッション開始時に2画面目にトラックパッドとキーボードを開きます。</string>
|
||||
<string name="dual_typing_title">上画面に入力中</string>
|
||||
<string name="dual_typing_done">完了</string>
|
||||
<string name="setup_default_home">デフォルトのホームアプリ</string>
|
||||
<string name="setup_choose_home">ホームアプリを選択</string>
|
||||
<string name="setup_choose">選択</string>
|
||||
|
||||
@@ -827,6 +827,17 @@
|
||||
<string name="setup_fullscreen">전체 화면</string>
|
||||
<string name="setup_fullscreen_on">Android 상태 표시줄 및 탐색 표시줄 숨기기</string>
|
||||
<string name="setup_fullscreen_off">Android 상태 표시줄 및 탐색 표시줄 표시</string>
|
||||
<string name="setup_dual_screen">듀얼 화면</string>
|
||||
<string name="setup_dual_screen_hint">자동은 두 번째 화면이 내장된 휴대용 기기에서 그 화면을 사용합니다. 켜기는 모든 두 번째 디스플레이를 사용합니다. 끄기는 모든 것을 한 화면에 둡니다.</string>
|
||||
<string name="setup_dual_screen_auto">자동</string>
|
||||
<string name="setup_dual_screen_on">켜기</string>
|
||||
<string name="setup_dual_screen_off">끄기</string>
|
||||
<string name="setup_dual_screen_menu">하단 화면 메뉴</string>
|
||||
<string name="setup_dual_screen_menu_hint">섹션과 게임 중 메뉴를 두 번째 화면으로 옮기고 입력도 그곳에서 하므로 상단 화면은 전체 보기를 유지합니다. L2와 R2로 섹션을 전환합니다.</string>
|
||||
<string name="setup_dual_screen_controls">게임 중 하단 화면 컨트롤</string>
|
||||
<string name="setup_dual_screen_controls_hint">세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다.</string>
|
||||
<string name="dual_typing_title">상단 화면에 입력 중</string>
|
||||
<string name="dual_typing_done">완료</string>
|
||||
<string name="setup_default_home">기본 홈 앱</string>
|
||||
<string name="setup_choose_home">홈 앱 선택</string>
|
||||
<string name="setup_choose">선택</string>
|
||||
|
||||
@@ -825,6 +825,17 @@
|
||||
<string name="setup_fullscreen">Skrin penuh</string>
|
||||
<string name="setup_fullscreen_on">Menyembunyikan bar status dan navigasi Android</string>
|
||||
<string name="setup_fullscreen_off">Memaparkan bar status dan navigasi Android</string>
|
||||
<string name="setup_dual_screen">Dwi skrin</string>
|
||||
<string name="setup_dual_screen_hint">Automatik menggunakan skrin kedua pada peranti pegang tangan yang mempunyai skrin terbina dalam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan semuanya pada satu skrin.</string>
|
||||
<string name="setup_dual_screen_auto">Automatik</string>
|
||||
<string name="setup_dual_screen_on">Hidup</string>
|
||||
<string name="setup_dual_screen_off">Mati</string>
|
||||
<string name="setup_dual_screen_menu">Menu skrin bawah</string>
|
||||
<string name="setup_dual_screen_menu_hint">Memindahkan bahagian dan menu dalam permainan ke skrin kedua dan menaip di sana, supaya skrin atas kekal dengan paparan penuh. L2 dan R2 menukar bahagian.</string>
|
||||
<string name="setup_dual_screen_controls">Kawalan skrin bawah dalam permainan</string>
|
||||
<string name="setup_dual_screen_controls_hint">Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula.</string>
|
||||
<string name="dual_typing_title">Menaip untuk skrin atas</string>
|
||||
<string name="dual_typing_done">Selesai</string>
|
||||
<string name="setup_default_home">Apl Utama lalai</string>
|
||||
<string name="setup_choose_home">Pilih apl Utama</string>
|
||||
<string name="setup_choose">Pilih</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Fullskjerm</string>
|
||||
<string name="setup_fullscreen_on">Skjuler Androids status- og navigasjonslinjer</string>
|
||||
<string name="setup_fullscreen_off">Viser Androids status- og navigasjonslinjer</string>
|
||||
<string name="setup_dual_screen">Dobbel skjerm</string>
|
||||
<string name="setup_dual_screen_hint">Automatisk bruker den andre skjermen på håndholdte enheter med innebygd skjerm. På bruker enhver annen skjerm. Av holder alt på én skjerm.</string>
|
||||
<string name="setup_dual_screen_auto">Automatisk</string>
|
||||
<string name="setup_dual_screen_on">På</string>
|
||||
<string name="setup_dual_screen_off">Av</string>
|
||||
<string name="setup_dual_screen_menu">Meny på nederste skjerm</string>
|
||||
<string name="setup_dual_screen_menu_hint">Flytter seksjonene og menyen i spillet til den andre skjermen og skriver der, så den øverste skjermen beholder hele visningen. L2 og R2 bytter seksjon.</string>
|
||||
<string name="setup_dual_screen_controls">Kontroller på nederste skjerm i spill</string>
|
||||
<string name="setup_dual_screen_controls_hint">Åpner styreflaten og tastaturet på den andre skjermen når en økt starter.</string>
|
||||
<string name="dual_typing_title">Skriver for den øverste skjermen</string>
|
||||
<string name="dual_typing_done">Ferdig</string>
|
||||
<string name="setup_default_home">Standard Hjem-app</string>
|
||||
<string name="setup_choose_home">Velg en Hjem-app</string>
|
||||
<string name="setup_choose">Velg</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Volledig scherm</string>
|
||||
<string name="setup_fullscreen_on">Verbergt de statusbalk en navigatiebalk van Android</string>
|
||||
<string name="setup_fullscreen_off">Toont de statusbalk en navigatiebalk van Android</string>
|
||||
<string name="setup_dual_screen">Dubbel scherm</string>
|
||||
<string name="setup_dual_screen_hint">Automatisch gebruikt het tweede scherm op handhelds met een ingebouwd scherm. Aan gebruikt elk tweede scherm. Uit houdt alles op één scherm.</string>
|
||||
<string name="setup_dual_screen_auto">Automatisch</string>
|
||||
<string name="setup_dual_screen_on">Aan</string>
|
||||
<string name="setup_dual_screen_off">Uit</string>
|
||||
<string name="setup_dual_screen_menu">Menu op het onderste scherm</string>
|
||||
<string name="setup_dual_screen_menu_hint">Verplaatst de onderdelen en het menu in het spel naar het tweede scherm en typt daar, zodat het bovenste scherm het volledige beeld houdt. L2 en R2 wisselen van onderdeel.</string>
|
||||
<string name="setup_dual_screen_controls">Bediening op het onderste scherm in games</string>
|
||||
<string name="setup_dual_screen_controls_hint">Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start.</string>
|
||||
<string name="dual_typing_title">Typen voor het bovenste scherm</string>
|
||||
<string name="dual_typing_done">Klaar</string>
|
||||
<string name="setup_default_home">Standaard startschermapp</string>
|
||||
<string name="setup_choose_home">Kies een startschermapp</string>
|
||||
<string name="setup_choose">Kiezen</string>
|
||||
|
||||
@@ -834,6 +834,17 @@
|
||||
<string name="setup_fullscreen">Pełny ekran</string>
|
||||
<string name="setup_fullscreen_on">Ukrywa systemowe paski stanu i nawigacji</string>
|
||||
<string name="setup_fullscreen_off">Pokazuje systemowe paski stanu i nawigacji</string>
|
||||
<string name="setup_dual_screen">Dwa ekrany</string>
|
||||
<string name="setup_dual_screen_hint">Automatycznie używa drugiego ekranu w urządzeniach przenośnych, które mają go wbudowanego. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone zostawia wszystko na jednym ekranie.</string>
|
||||
<string name="setup_dual_screen_auto">Automatycznie</string>
|
||||
<string name="setup_dual_screen_on">Włączone</string>
|
||||
<string name="setup_dual_screen_off">Wyłączone</string>
|
||||
<string name="setup_dual_screen_menu">Menu na dolnym ekranie</string>
|
||||
<string name="setup_dual_screen_menu_hint">Przenosi sekcje i menu w grze na drugi ekran i tam odbywa się pisanie, dzięki czemu górny ekran zachowuje pełny widok. L2 i R2 przełączają sekcje.</string>
|
||||
<string name="setup_dual_screen_controls">Sterowanie na dolnym ekranie w grach</string>
|
||||
<string name="setup_dual_screen_controls_hint">Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji.</string>
|
||||
<string name="dual_typing_title">Pisanie dla górnego ekranu</string>
|
||||
<string name="dual_typing_done">Gotowe</string>
|
||||
<string name="setup_default_home">Domyślna aplikacja ekranu głównego</string>
|
||||
<string name="setup_choose_home">Wybierz aplikację ekranu głównego</string>
|
||||
<string name="setup_choose">Wybierz</string>
|
||||
|
||||
@@ -823,6 +823,17 @@
|
||||
<string name="setup_fullscreen">Ecrã inteiro</string>
|
||||
<string name="setup_fullscreen_on">Oculta as barras de estado e de navegação do Android</string>
|
||||
<string name="setup_fullscreen_off">Mostra as barras de estado e de navegação do Android</string>
|
||||
<string name="setup_dual_screen">Ecrã duplo</string>
|
||||
<string name="setup_dual_screen_hint">Automático usa o segundo ecrã em consolas portáteis com ecrã secundário integrado. Ativado usa qualquer segundo ecrã. Desativado mantém tudo num só ecrã.</string>
|
||||
<string name="setup_dual_screen_auto">Automático</string>
|
||||
<string name="setup_dual_screen_on">Ativado</string>
|
||||
<string name="setup_dual_screen_off">Desativado</string>
|
||||
<string name="setup_dual_screen_menu">Menu no ecrã inferior</string>
|
||||
<string name="setup_dual_screen_menu_hint">Move as secções e o menu do jogo para o segundo ecrã e a escrita é feita lá, para que o ecrã superior mantenha a vista completa. L2 e R2 mudam de secção.</string>
|
||||
<string name="setup_dual_screen_controls">Controlos no ecrã inferior nos jogos</string>
|
||||
<string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa.</string>
|
||||
<string name="dual_typing_title">A escrever para o ecrã superior</string>
|
||||
<string name="dual_typing_done">Concluído</string>
|
||||
<string name="setup_default_home">App de página inicial predefinida</string>
|
||||
<string name="setup_choose_home">Escolher uma app de página inicial</string>
|
||||
<string name="setup_choose">Escolher</string>
|
||||
|
||||
@@ -823,6 +823,17 @@
|
||||
<string name="setup_fullscreen">Tela cheia</string>
|
||||
<string name="setup_fullscreen_on">Oculta as barras de status e de navegação do Android</string>
|
||||
<string name="setup_fullscreen_off">Mostra as barras de status e de navegação do Android</string>
|
||||
<string name="setup_dual_screen">Tela dupla</string>
|
||||
<string name="setup_dual_screen_hint">Automático usa a segunda tela em portáteis que têm uma integrada. Ativado usa qualquer segunda tela. Desativado mantém tudo em uma tela.</string>
|
||||
<string name="setup_dual_screen_auto">Automático</string>
|
||||
<string name="setup_dual_screen_on">Ativado</string>
|
||||
<string name="setup_dual_screen_off">Desativado</string>
|
||||
<string name="setup_dual_screen_menu">Menu na tela inferior</string>
|
||||
<string name="setup_dual_screen_menu_hint">Move as seções e o menu do jogo para a segunda tela e a digitação acontece lá, para que a tela superior mantenha a visão completa. L2 e R2 trocam de seção.</string>
|
||||
<string name="setup_dual_screen_controls">Controles na tela inferior nos jogos</string>
|
||||
<string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado na segunda tela quando uma sessão começa.</string>
|
||||
<string name="dual_typing_title">Digitando para a tela superior</string>
|
||||
<string name="dual_typing_done">Concluído</string>
|
||||
<string name="setup_default_home">App de início padrão</string>
|
||||
<string name="setup_choose_home">Escolher um app de início</string>
|
||||
<string name="setup_choose">Escolher</string>
|
||||
|
||||
@@ -831,6 +831,17 @@
|
||||
<string name="setup_fullscreen">Ecran complet</string>
|
||||
<string name="setup_fullscreen_on">Ascunde barele de stare și de navigare Android</string>
|
||||
<string name="setup_fullscreen_off">Arată barele de stare și de navigare Android</string>
|
||||
<string name="setup_dual_screen">Ecran dublu</string>
|
||||
<string name="setup_dual_screen_hint">Automat folosește al doilea ecran pe consolele portabile care au unul integrat. Pornit folosește orice al doilea afișaj. Oprit păstrează totul pe un singur ecran.</string>
|
||||
<string name="setup_dual_screen_auto">Automat</string>
|
||||
<string name="setup_dual_screen_on">Pornit</string>
|
||||
<string name="setup_dual_screen_off">Oprit</string>
|
||||
<string name="setup_dual_screen_menu">Meniu pe ecranul de jos</string>
|
||||
<string name="setup_dual_screen_menu_hint">Mută secțiunile și meniul din joc pe al doilea ecran și scrierea se face acolo, astfel încât ecranul de sus păstrează imaginea completă. L2 și R2 schimbă secțiunea.</string>
|
||||
<string name="setup_dual_screen_controls">Comenzi pe ecranul de jos în jocuri</string>
|
||||
<string name="setup_dual_screen_controls_hint">Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune.</string>
|
||||
<string name="dual_typing_title">Scriere pentru ecranul de sus</string>
|
||||
<string name="dual_typing_done">Gata</string>
|
||||
<string name="setup_default_home">Aplicația Acasă implicită</string>
|
||||
<string name="setup_choose_home">Alege o aplicație Acasă</string>
|
||||
<string name="setup_choose">Alege</string>
|
||||
|
||||
@@ -836,6 +836,17 @@
|
||||
<string name="setup_fullscreen">Полноэкранный режим</string>
|
||||
<string name="setup_fullscreen_on">Скрывает строку состояния и панель навигации Android</string>
|
||||
<string name="setup_fullscreen_off">Показывает строку состояния и панель навигации Android</string>
|
||||
<string name="setup_dual_screen">Два экрана</string>
|
||||
<string name="setup_dual_screen_hint">Автоматически — использует второй экран на портативных устройствах со встроенным вторым экраном. Вкл. — использует любой второй дисплей. Выкл. — всё остаётся на одном экране.</string>
|
||||
<string name="setup_dual_screen_auto">Автоматически</string>
|
||||
<string name="setup_dual_screen_on">Вкл.</string>
|
||||
<string name="setup_dual_screen_off">Выкл.</string>
|
||||
<string name="setup_dual_screen_menu">Меню на нижнем экране</string>
|
||||
<string name="setup_dual_screen_menu_hint">Переносит разделы и меню в игре на второй экран, и ввод выполняется там, поэтому верхний экран остаётся полностью свободным. L2 и R2 переключают разделы.</string>
|
||||
<string name="setup_dual_screen_controls">Управление на нижнем экране в играх</string>
|
||||
<string name="setup_dual_screen_controls_hint">Открывает тачпад и клавиатуру на втором экране при запуске сеанса.</string>
|
||||
<string name="dual_typing_title">Ввод для верхнего экрана</string>
|
||||
<string name="dual_typing_done">Готово</string>
|
||||
<string name="setup_default_home">Главный экран по умолчанию</string>
|
||||
<string name="setup_choose_home">Выбрать главный экран</string>
|
||||
<string name="setup_choose">Выбрать</string>
|
||||
|
||||
@@ -828,6 +828,17 @@
|
||||
<string name="setup_fullscreen">Helskärm</string>
|
||||
<string name="setup_fullscreen_on">Döljer Androids statusfält och navigeringsfält</string>
|
||||
<string name="setup_fullscreen_off">Visar Androids statusfält och navigeringsfält</string>
|
||||
<string name="setup_dual_screen">Dubbelskärm</string>
|
||||
<string name="setup_dual_screen_hint">Automatiskt använder den andra skärmen på handhållna enheter med en inbyggd andra skärm. På använder vilken andra skärm som helst. Av håller allt på en skärm.</string>
|
||||
<string name="setup_dual_screen_auto">Automatiskt</string>
|
||||
<string name="setup_dual_screen_on">På</string>
|
||||
<string name="setup_dual_screen_off">Av</string>
|
||||
<string name="setup_dual_screen_menu">Meny på nedre skärmen</string>
|
||||
<string name="setup_dual_screen_menu_hint">Flyttar avsnitten och menyn i spelet till den andra skärmen och skrivandet sker där, så att den övre skärmen behåller hela vyn. L2 och R2 byter avsnitt.</string>
|
||||
<string name="setup_dual_screen_controls">Kontroller på nedre skärmen i spel</string>
|
||||
<string name="setup_dual_screen_controls_hint">Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar.</string>
|
||||
<string name="dual_typing_title">Skriver för den övre skärmen</string>
|
||||
<string name="dual_typing_done">Klar</string>
|
||||
<string name="setup_default_home">Standardapp för startskärmen</string>
|
||||
<string name="setup_choose_home">Välj en app för startskärmen</string>
|
||||
<string name="setup_choose">Välj</string>
|
||||
|
||||
@@ -825,6 +825,17 @@
|
||||
<string name="setup_fullscreen">เต็มจอ</string>
|
||||
<string name="setup_fullscreen_on">ซ่อนแถบสถานะและแถบนำทางของ Android</string>
|
||||
<string name="setup_fullscreen_off">แสดงแถบสถานะและแถบนำทางของ Android</string>
|
||||
<string name="setup_dual_screen">หน้าจอคู่</string>
|
||||
<string name="setup_dual_screen_hint">อัตโนมัติจะใช้หน้าจอที่สองบนเครื่องพกพาที่มีหน้าจอที่สองในตัว เปิดจะใช้หน้าจอที่สองใดก็ได้ ปิดจะแสดงทุกอย่างบนหน้าจอเดียว</string>
|
||||
<string name="setup_dual_screen_auto">อัตโนมัติ</string>
|
||||
<string name="setup_dual_screen_on">เปิด</string>
|
||||
<string name="setup_dual_screen_off">ปิด</string>
|
||||
<string name="setup_dual_screen_menu">เมนูหน้าจอล่าง</string>
|
||||
<string name="setup_dual_screen_menu_hint">ย้ายส่วนต่าง ๆ และเมนูระหว่างเล่นเกมไปที่หน้าจอที่สองและพิมพ์ที่นั่น เพื่อให้หน้าจอบนแสดงเต็มพื้นที่ L2 และ R2 ใช้สลับส่วน</string>
|
||||
<string name="setup_dual_screen_controls">ปุ่มควบคุมหน้าจอล่างในเกม</string>
|
||||
<string name="setup_dual_screen_controls_hint">เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน</string>
|
||||
<string name="dual_typing_title">กำลังพิมพ์ให้หน้าจอบน</string>
|
||||
<string name="dual_typing_done">เสร็จสิ้น</string>
|
||||
<string name="setup_default_home">แอปหน้าจอหลักเริ่มต้น</string>
|
||||
<string name="setup_choose_home">เลือกแอปหน้าจอหลัก</string>
|
||||
<string name="setup_choose">เลือก</string>
|
||||
|
||||
@@ -820,6 +820,17 @@
|
||||
<string name="setup_fullscreen">Tam ekran</string>
|
||||
<string name="setup_fullscreen_on">Android durum ve gezinme çubuklarını gizler</string>
|
||||
<string name="setup_fullscreen_off">Android durum ve gezinme çubuklarını gösterir</string>
|
||||
<string name="setup_dual_screen">Çift ekran</string>
|
||||
<string name="setup_dual_screen_hint">Otomatik, dahili ikinci ekranı olan el konsollarında ikinci ekranı kullanır. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, her şeyi tek ekranda tutar.</string>
|
||||
<string name="setup_dual_screen_auto">Otomatik</string>
|
||||
<string name="setup_dual_screen_on">Açık</string>
|
||||
<string name="setup_dual_screen_off">Kapalı</string>
|
||||
<string name="setup_dual_screen_menu">Alt ekran menüsü</string>
|
||||
<string name="setup_dual_screen_menu_hint">Bölümleri ve oyun içi menüyü ikinci ekrana taşır ve yazma orada yapılır, böylece üst ekran tam görünümü korur. L2 ve R2 bölümler arasında geçiş yapar.</string>
|
||||
<string name="setup_dual_screen_controls">Oyunlarda alt ekran kontrolleri</string>
|
||||
<string name="setup_dual_screen_controls_hint">Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar.</string>
|
||||
<string name="dual_typing_title">Üst ekran için yazılıyor</string>
|
||||
<string name="dual_typing_done">Bitti</string>
|
||||
<string name="setup_default_home">Varsayılan ana ekran uygulaması</string>
|
||||
<string name="setup_choose_home">Ana ekran uygulaması seçin</string>
|
||||
<string name="setup_choose">Seç</string>
|
||||
|
||||
@@ -834,6 +834,17 @@
|
||||
<string name="setup_fullscreen">Повний екран</string>
|
||||
<string name="setup_fullscreen_on">Приховує рядок стану та панель навігації Android</string>
|
||||
<string name="setup_fullscreen_off">Показує рядок стану та панель навігації Android</string>
|
||||
<string name="setup_dual_screen">Два екрани</string>
|
||||
<string name="setup_dual_screen_hint">Автоматично — використовує другий екран на портативних пристроях із вбудованим другим екраном. Увімк. — використовує будь-який другий дисплей. Вимк. — усе лишається на одному екрані.</string>
|
||||
<string name="setup_dual_screen_auto">Автоматично</string>
|
||||
<string name="setup_dual_screen_on">Увімк.</string>
|
||||
<string name="setup_dual_screen_off">Вимк.</string>
|
||||
<string name="setup_dual_screen_menu">Меню на нижньому екрані</string>
|
||||
<string name="setup_dual_screen_menu_hint">Переносить розділи та меню в грі на другий екран, і введення відбувається там, тож верхній екран лишається повністю вільним. L2 і R2 перемикають розділи.</string>
|
||||
<string name="setup_dual_screen_controls">Керування на нижньому екрані в іграх</string>
|
||||
<string name="setup_dual_screen_controls_hint">Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу.</string>
|
||||
<string name="dual_typing_title">Введення для верхнього екрана</string>
|
||||
<string name="dual_typing_done">Готово</string>
|
||||
<string name="setup_default_home">Стандартний додаток головного екрана</string>
|
||||
<string name="setup_choose_home">Виберіть додаток головного екрана</string>
|
||||
<string name="setup_choose">Вибрати</string>
|
||||
|
||||
@@ -825,6 +825,17 @@
|
||||
<string name="setup_fullscreen">Toàn màn hình</string>
|
||||
<string name="setup_fullscreen_on">Ẩn thanh trạng thái và thanh điều hướng của Android</string>
|
||||
<string name="setup_fullscreen_off">Hiện thanh trạng thái và thanh điều hướng của Android</string>
|
||||
<string name="setup_dual_screen">Màn hình kép</string>
|
||||
<string name="setup_dual_screen_hint">Tự động dùng màn hình thứ hai trên máy cầm tay có màn hình thứ hai tích hợp. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ mọi thứ trên một màn hình.</string>
|
||||
<string name="setup_dual_screen_auto">Tự động</string>
|
||||
<string name="setup_dual_screen_on">Bật</string>
|
||||
<string name="setup_dual_screen_off">Tắt</string>
|
||||
<string name="setup_dual_screen_menu">Menu ở màn hình dưới</string>
|
||||
<string name="setup_dual_screen_menu_hint">Chuyển các mục và menu trong trò chơi sang màn hình thứ hai và nhập liệu ở đó, để màn hình trên giữ toàn bộ khung nhìn. L2 và R2 chuyển mục.</string>
|
||||
<string name="setup_dual_screen_controls">Điều khiển màn hình dưới khi chơi game</string>
|
||||
<string name="setup_dual_screen_controls_hint">Mở bàn di chuột và bàn phím trên màn hình thứ hai khi phiên bắt đầu.</string>
|
||||
<string name="dual_typing_title">Đang nhập cho màn hình trên</string>
|
||||
<string name="dual_typing_done">Xong</string>
|
||||
<string name="setup_default_home">Ứng dụng Màn hình chính mặc định</string>
|
||||
<string name="setup_choose_home">Chọn một ứng dụng Màn hình chính</string>
|
||||
<string name="setup_choose">Chọn</string>
|
||||
|
||||
@@ -827,6 +827,17 @@
|
||||
<string name="setup_fullscreen">全屏</string>
|
||||
<string name="setup_fullscreen_on">隐藏 Android 状态栏和导航栏</string>
|
||||
<string name="setup_fullscreen_off">显示 Android 状态栏和导航栏</string>
|
||||
<string name="setup_dual_screen">双屏</string>
|
||||
<string name="setup_dual_screen_hint">自动:在内置第二块屏幕的掌机上使用该屏幕。开启:使用任何第二块显示器。关闭:所有内容只显示在一块屏幕上。</string>
|
||||
<string name="setup_dual_screen_auto">自动</string>
|
||||
<string name="setup_dual_screen_on">开启</string>
|
||||
<string name="setup_dual_screen_off">关闭</string>
|
||||
<string name="setup_dual_screen_menu">下屏菜单</string>
|
||||
<string name="setup_dual_screen_menu_hint">将各个分区和游戏内菜单移到第二块屏幕并在那里输入,让上屏保持完整画面。L2 和 R2 切换分区。</string>
|
||||
<string name="setup_dual_screen_controls">游戏中的下屏控制</string>
|
||||
<string name="setup_dual_screen_controls_hint">会话开始时在第二块屏幕上打开触控板和键盘。</string>
|
||||
<string name="dual_typing_title">正在为上屏输入</string>
|
||||
<string name="dual_typing_done">完成</string>
|
||||
<string name="setup_default_home">默认主屏幕应用</string>
|
||||
<string name="setup_choose_home">选择主屏幕应用</string>
|
||||
<string name="setup_choose">选择</string>
|
||||
|
||||
@@ -827,6 +827,17 @@
|
||||
<string name="setup_fullscreen">全螢幕</string>
|
||||
<string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string>
|
||||
<string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string>
|
||||
<string name="setup_dual_screen">雙屏</string>
|
||||
<string name="setup_dual_screen_hint">自動:在內置第二塊螢幕的掌機上使用該螢幕。開啟:使用任何第二塊顯示器。關閉:所有內容只顯示在一塊螢幕上。</string>
|
||||
<string name="setup_dual_screen_auto">自動</string>
|
||||
<string name="setup_dual_screen_on">開啟</string>
|
||||
<string name="setup_dual_screen_off">關閉</string>
|
||||
<string name="setup_dual_screen_menu">下屏選單</string>
|
||||
<string name="setup_dual_screen_menu_hint">將各個分區和遊戲內選單移到第二塊螢幕並在那裡輸入,讓上屏保持完整畫面。L2 和 R2 切換分區。</string>
|
||||
<string name="setup_dual_screen_controls">遊戲中的下屏控制</string>
|
||||
<string name="setup_dual_screen_controls_hint">工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。</string>
|
||||
<string name="dual_typing_title">正在為上屏輸入</string>
|
||||
<string name="dual_typing_done">完成</string>
|
||||
<string name="setup_default_home">預設主畫面應用程式</string>
|
||||
<string name="setup_choose_home">選擇主畫面應用程式</string>
|
||||
<string name="setup_choose">選擇</string>
|
||||
|
||||
@@ -827,6 +827,17 @@
|
||||
<string name="setup_fullscreen">全螢幕</string>
|
||||
<string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string>
|
||||
<string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string>
|
||||
<string name="setup_dual_screen">雙螢幕</string>
|
||||
<string name="setup_dual_screen_hint">自動:在內建第二個螢幕的掌機上使用該螢幕。開啟:使用任何第二個顯示器。關閉:所有內容只顯示在一個螢幕上。</string>
|
||||
<string name="setup_dual_screen_auto">自動</string>
|
||||
<string name="setup_dual_screen_on">開啟</string>
|
||||
<string name="setup_dual_screen_off">關閉</string>
|
||||
<string name="setup_dual_screen_menu">下螢幕選單</string>
|
||||
<string name="setup_dual_screen_menu_hint">將各個區塊和遊戲內選單移到第二個螢幕並在那裡輸入,讓上螢幕保持完整畫面。L2 和 R2 切換區塊。</string>
|
||||
<string name="setup_dual_screen_controls">遊戲中的下螢幕控制</string>
|
||||
<string name="setup_dual_screen_controls_hint">工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。</string>
|
||||
<string name="dual_typing_title">正在為上螢幕輸入</string>
|
||||
<string name="dual_typing_done">完成</string>
|
||||
<string name="setup_default_home">預設主螢幕應用程式</string>
|
||||
<string name="setup_choose_home">選擇主螢幕應用程式</string>
|
||||
<string name="setup_choose">選擇</string>
|
||||
|
||||
@@ -925,6 +925,17 @@
|
||||
<string name="setup_fullscreen">Fullscreen</string>
|
||||
<string name="setup_fullscreen_on">Hides the Android status and navigation bars</string>
|
||||
<string name="setup_fullscreen_off">Shows the Android status and navigation bars</string>
|
||||
<string name="setup_dual_screen">Dual screen</string>
|
||||
<string name="setup_dual_screen_hint">Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps everything on one screen.</string>
|
||||
<string name="setup_dual_screen_auto">Automatic</string>
|
||||
<string name="setup_dual_screen_on">On</string>
|
||||
<string name="setup_dual_screen_off">Off</string>
|
||||
<string name="setup_dual_screen_menu">Bottom screen menu</string>
|
||||
<string name="setup_dual_screen_menu_hint">Moves the sections and the in-game menu to the second screen and types there, so the top screen keeps the full view. L2 and R2 switch sections.</string>
|
||||
<string name="setup_dual_screen_controls">Bottom screen controls in games</string>
|
||||
<string name="setup_dual_screen_controls_hint">Opens the trackpad and keyboard on the second screen when a session starts.</string>
|
||||
<string name="dual_typing_title">Typing on the top screen</string>
|
||||
<string name="dual_typing_done">Done</string>
|
||||
<string name="setup_default_home">Default Home app</string>
|
||||
<string name="setup_choose_home">Choose a Home app</string>
|
||||
<string name="setup_choose">Choose</string>
|
||||
@@ -3393,7 +3404,6 @@
|
||||
<string name="integration_title">Steam integration</string>
|
||||
<string name="integration_count">%1$d of %2$d on</string>
|
||||
<string name="integration_set_up">Set up</string>
|
||||
<string name="integration_later">Not now</string>
|
||||
<string name="integration_location">Location</string>
|
||||
<string name="integration_app_info">App info</string>
|
||||
<string name="integration_wifi">Wi-Fi names</string>
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.droiddeck.launcher.core
|
||||
|
||||
import android.app.Application
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
import com.droiddeck.launcher.session.SettingsReset
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [33], manifest = Config.NONE, application = Application::class)
|
||||
class SteamIntegrationSuggestionTest {
|
||||
private val context: Application = ApplicationProvider.getApplicationContext()
|
||||
|
||||
@Test fun closingTheSuggestionKeepsItHiddenForGood() {
|
||||
assertTrue(SteamIntegration.read(context).suggested)
|
||||
SteamIntegration.dismissSuggestion(context)
|
||||
assertFalse(SteamIntegration.read(context).suggested)
|
||||
SettingsReset.resetAll(context, gameProfiles = false)
|
||||
assertFalse(SteamIntegration.read(context).suggested)
|
||||
assertTrue(SessionPrefs.sessionPrefs(context).getBoolean("steam_integration_seen", false))
|
||||
}
|
||||
}
|
||||
@@ -64,6 +64,18 @@ class GpuDetectionTest {
|
||||
assertEquals(Support.UNSUPPORTED, info(false, 830).support)
|
||||
}
|
||||
|
||||
@Test fun adreno722IsSupportedOnlyOnTheRetroidPocketDuo() {
|
||||
assertEquals(true, GpuInfo.verifiedOn(722, "Retroid Pocket Duo"))
|
||||
assertEquals(false, GpuInfo.verifiedOn(722, "Retroid Pocket 5"))
|
||||
assertEquals(false, GpuInfo.verifiedOn(720, "Retroid Pocket Duo"))
|
||||
assertEquals(false, GpuInfo.verifiedOn(740, "Retroid Pocket Duo"))
|
||||
val duo = info(true, 722).copy(verifiedDevice = true)
|
||||
assertEquals(Support.TESTED, duo.support)
|
||||
assertEquals("Supported", duo.supportText)
|
||||
assertEquals(Family.A7XX_LOW, duo.family)
|
||||
assertEquals(Support.UNTESTED, info(true, 722).support)
|
||||
}
|
||||
|
||||
@Test fun userFacingTextPerTier() {
|
||||
assertEquals("Supported", info(true, 830).supportText)
|
||||
assertEquals("Experimental Adreno 850 support: requires compatible experimental display and game drivers; not verified on this device", info(true, 850).supportText)
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.content.Context
|
||||
import android.hardware.display.DisplayManager
|
||||
import android.view.Display
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(manifest = Config.NONE)
|
||||
class DualScreenTest {
|
||||
private val context: Context = ApplicationProvider.getApplicationContext()
|
||||
private val displays = context.getSystemService(DisplayManager::class.java)
|
||||
|
||||
@Test fun internalPanelsCountAsBuiltIn() {
|
||||
assertTrue(DualScreen.isBuiltIn(1, "Anything"))
|
||||
assertFalse(DualScreen.isBuiltIn(2, "Retroid Pocket Duo"))
|
||||
assertFalse(DualScreen.isBuiltIn(5, "AYN Thor"))
|
||||
}
|
||||
|
||||
@Test fun knownModelsCountWhenTheTypeIsHidden() {
|
||||
assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo"))
|
||||
assertTrue(DualScreen.isBuiltIn(null, " AYN Thor "))
|
||||
assertFalse(DualScreen.isBuiltIn(null, "Pixel 8"))
|
||||
}
|
||||
|
||||
@Test fun oneScreenDevicesGetNoSecondScreenInAnyMode() {
|
||||
for (mode in DualScreen.modes) {
|
||||
SessionPrefs.setDualScreenMode(context, mode)
|
||||
assertNull(DualScreen.display(context, displays, Display.DEFAULT_DISPLAY))
|
||||
assertNull(DualScreen.anyDisplay(displays, Display.DEFAULT_DISPLAY))
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun modeDefaultsToAutomaticAndIgnoresUnknownValues() {
|
||||
assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenMode(context))
|
||||
SessionPrefs.setDualScreenMode(context, "sideways")
|
||||
assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenMode(context))
|
||||
SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF)
|
||||
assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context))
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.shadows.ShadowBuild
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [28, 33], manifest = Config.NONE, application = Application::class)
|
||||
@@ -67,4 +68,24 @@ class HomeGuideInputTest {
|
||||
assertEquals(listOf(true, false), states)
|
||||
assertEquals(1, cancellations)
|
||||
}
|
||||
|
||||
private fun quickMenu(action: Int) = KeyEvent(10, 110, action, KeyEvent.KEYCODE_HOME, 0, 0, 10, 194)
|
||||
|
||||
@Test fun duoQuickMenuHomePassesThroughToTheSystemAndCancelsAHeldGuide() {
|
||||
ShadowBuild.setModel("Retroid Pocket Duo")
|
||||
assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true))
|
||||
assertFalse(input.onKeyEvent(quickMenu(KeyEvent.ACTION_DOWN), true))
|
||||
assertEquals(listOf(true, false), states)
|
||||
assertEquals(1, cancellations)
|
||||
assertFalse(input.onKeyEvent(quickMenu(KeyEvent.ACTION_UP), true))
|
||||
assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP), true))
|
||||
assertEquals(listOf(true, false), states)
|
||||
}
|
||||
|
||||
@Test fun theSameScanCodeStillHoldsGuideOnOtherDevices() {
|
||||
ShadowBuild.setModel("Retroid Pocket 5")
|
||||
assertTrue(input.onKeyEvent(quickMenu(KeyEvent.ACTION_DOWN), true))
|
||||
assertTrue(input.onKeyEvent(quickMenu(KeyEvent.ACTION_UP), true))
|
||||
assertEquals(listOf(true, false), states)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import android.view.KeyEvent
|
||||
import androidx.compose.ui.text.TextRange
|
||||
import androidx.compose.ui.text.input.CommitTextCommand
|
||||
import androidx.compose.ui.text.input.DeleteAllCommand
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.text.input.ImeOptions
|
||||
import androidx.compose.ui.text.input.SetSelectionCommand
|
||||
import androidx.compose.ui.text.input.TextFieldValue
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(manifest = Config.NONE)
|
||||
class BottomScreenTypingTest {
|
||||
@Test fun editsReplaceTheWholeFieldAndKeepTheCursor() {
|
||||
val edits = TypingRequest.editsFor(TextFieldValue("fall", TextRange(2, 4)))
|
||||
assertEquals(3, edits.size)
|
||||
assertTrue(edits[0] is DeleteAllCommand)
|
||||
assertEquals("fall", (edits[1] as CommitTextCommand).text)
|
||||
val selection = edits[2] as SetSelectionCommand
|
||||
assertEquals(2, selection.start)
|
||||
assertEquals(4, selection.end)
|
||||
}
|
||||
|
||||
@Test fun requestForwardsTextActionAndClose() {
|
||||
val sent = mutableListOf<String>()
|
||||
val actions = mutableListOf<ImeAction>()
|
||||
var closed = 0
|
||||
val request = TypingRequest(
|
||||
TextFieldValue("a"), ImeOptions(imeAction = ImeAction.Search),
|
||||
{ sent += it.text }, { actions += it }, { closed++ },
|
||||
)
|
||||
request.send(TextFieldValue("ab"))
|
||||
request.action()
|
||||
request.close()
|
||||
assertEquals(listOf("ab"), sent)
|
||||
assertEquals("ab", request.value.text)
|
||||
assertEquals(listOf(ImeAction.Search), actions)
|
||||
assertEquals(1, closed)
|
||||
}
|
||||
|
||||
@Test fun panelStopsOnlyItsOwnRequest() {
|
||||
val first = TypingRequest(TextFieldValue(""), ImeOptions.Default, {}, {})
|
||||
val second = TypingRequest(TextFieldValue(""), ImeOptions.Default, {}, {})
|
||||
DualScreenPanel.startTyping(second)
|
||||
DualScreenPanel.stopTyping(first)
|
||||
assertEquals(second, DualScreenPanel.typing)
|
||||
DualScreenPanel.stopTyping(second)
|
||||
assertNull(DualScreenPanel.typing)
|
||||
}
|
||||
|
||||
@Test fun triggersStepThroughSections() {
|
||||
assertEquals(-1, dualPageStep(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_L2)))
|
||||
assertEquals(1, dualPageStep(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_R2)))
|
||||
assertNull(dualPageStep(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_L1)))
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import android.view.InputDevice
|
||||
import android.view.KeyEvent
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.Button
|
||||
import android.widget.TextView
|
||||
import androidx.compose.ui.test.*
|
||||
import androidx.compose.ui.semantics.SemanticsProperties.StateDescription
|
||||
import androidx.compose.runtime.MutableState
|
||||
@@ -76,6 +76,28 @@ class SessionSecondScreenTest {
|
||||
|
||||
@Test fun steamTrackpadKeepsWorkingSteamShortcuts() = checkShortcuts(steam = true)
|
||||
|
||||
@Test fun trackpadMenuButtonOnlyAppearsWhenTheMenuCanMove() {
|
||||
SessionState.mode = SessionService.MODE_STEAM
|
||||
val activity = Robolectric.buildActivity(SessionActivity::class.java).get()
|
||||
val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY)
|
||||
val label = context.getString(R.string.touch_droiddeck_menu)
|
||||
for (movable in listOf(false, true)) {
|
||||
var menus = 0
|
||||
val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {},
|
||||
{}, {}, {}, onMenu = if (movable) ({ menus++ }) else null)
|
||||
try {
|
||||
panel.create()
|
||||
panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD)
|
||||
val buttons = descendants(panel.window!!.decorView).filter { it.contentDescription == label }.toList()
|
||||
assertEquals(if (movable) 1 else 0, buttons.size)
|
||||
buttons.forEach { it.performClick() }
|
||||
assertEquals(if (movable) 1 else 0, menus)
|
||||
} finally {
|
||||
panel.closeControls()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(sdk = [34], shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class])
|
||||
fun controllerBumpersReachTheSecondScreenInBothSessionModes() {
|
||||
@@ -86,7 +108,7 @@ class SessionSecondScreenTest {
|
||||
SessionState.mode = mode
|
||||
val activity = Robolectric.buildActivity(SessionActivity::class.java).get()
|
||||
fun <T> state(name: String): MutableState<T> = ReflectionHelpers.getField(activity, "$name\$delegate")
|
||||
state<Boolean>("drawerOpen").value = true
|
||||
state<Boolean>("drawerOpenState").value = true
|
||||
state<Boolean>("drawerControllerActive").value = true
|
||||
state<List<SecondScreenDisplay>>("secondScreenDisplays").value = listOf(SecondScreenDisplay(1, "Bottom screen"))
|
||||
for ((button, page) in listOf(KeyEvent.KEYCODE_BUTTON_R1 to SessionDrawerPage.SECOND_SCREEN,
|
||||
@@ -106,7 +128,7 @@ class SessionSecondScreenTest {
|
||||
shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device)
|
||||
SessionState.mode = SessionService.MODE_STEAM
|
||||
val activity = Robolectric.buildActivity(SessionActivity::class.java).get()
|
||||
val open: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerOpen\$delegate")
|
||||
val open: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerOpenState\$delegate")
|
||||
val controller: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerControllerActive\$delegate")
|
||||
controller.value = true
|
||||
for (button in listOf(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_START)) {
|
||||
@@ -188,9 +210,9 @@ class SessionSecondScreenTest {
|
||||
try {
|
||||
panel.create()
|
||||
panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD)
|
||||
val buttons = descendants(panel.window!!.decorView).filterIsInstance<Button>().toList()
|
||||
val buttons = descendants(panel.window!!.decorView).filterIsInstance<TextView>().filter { it.isClickable }.toList()
|
||||
assertTrue(buttons.any { it.text == context.getString(R.string.second_show_keyboard) })
|
||||
val shortcuts = buttons.filter { it.text == "STEAM" || it.text == "…" }
|
||||
val shortcuts = buttons.filter { it.text == "STEAM" || it.text == "•••" }
|
||||
if (steam) {
|
||||
assertEquals(2, shortcuts.size)
|
||||
shortcuts.forEach { it.performClick() }
|
||||
|
||||
@@ -605,9 +605,56 @@ KEYBOARD_CHECK_SECONDS = 30
|
||||
KEYBOARD_JS = r"""
|
||||
(() => {
|
||||
const self = window.__droiddeckKeyboard || (window.__droiddeckKeyboard = { watched: new WeakSet(), last: null });
|
||||
self.wrapped = self.wrapped || new WeakSet();
|
||||
self.route = self.route === true;
|
||||
self.wrap = vkm => {
|
||||
if (!vkm || self.wrapped.has(vkm) || typeof vkm.ShowVirtualKeyboard !== "function") return;
|
||||
self.wrapped.add(vkm);
|
||||
const show = vkm.ShowVirtualKeyboard;
|
||||
vkm.ShowVirtualKeyboard = function (ref, props, modal) {
|
||||
if (self.route && !modal && typeof this.SetActiveVirtualKeyboardTarget === "function" &&
|
||||
!this.BUseVRKeyboard?.() && !this.m_Instance?.IsDesktopOverlayWindow?.()) {
|
||||
this.SetActiveVirtualKeyboardTarget(ref, props);
|
||||
self.follow(this);
|
||||
if (typeof window.__BINDING__ === "function") window.__BINDING__("request");
|
||||
return;
|
||||
}
|
||||
return show.call(this, ref, props, modal);
|
||||
};
|
||||
};
|
||||
self.editing = vkm => {
|
||||
let el = null;
|
||||
try { el = vkm?.m_ownerWindow?.document?.activeElement || null; } catch (e) {}
|
||||
if (!el) return null;
|
||||
return el.tagName === "TEXTAREA" || el.isContentEditable === true ||
|
||||
(el.tagName === "INPUT" && !/^(button|checkbox|radio|range|submit|reset|file|image|color)$/i.test(el.type || ""));
|
||||
};
|
||||
self.follow = vkm => {
|
||||
self.active = vkm;
|
||||
self.missed = 0;
|
||||
self.seen = false;
|
||||
self.follower = self.follower || setInterval(() => {
|
||||
if (!self.active) return;
|
||||
const ref = self.active.m_currentVirtualKeyboardRef;
|
||||
const editing = self.editing(self.active);
|
||||
const valid = !!ref && (editing !== null ? editing :
|
||||
(typeof ref.BIsElementValidForInput !== "function" || ref.BIsElementValidForInput()));
|
||||
if (valid) self.seen = true;
|
||||
if (self.route && ref && (valid || !self.seen)) {
|
||||
self.missed = 0;
|
||||
return;
|
||||
}
|
||||
if (++self.missed < 2) return;
|
||||
self.active = null;
|
||||
clearInterval(self.follower);
|
||||
self.follower = null;
|
||||
if (typeof window.__BINDING__ === "function") window.__BINDING__("dismiss");
|
||||
}, 150);
|
||||
};
|
||||
self.check = () => {
|
||||
let showing = false;
|
||||
for (const win of Array.from(globalThis.SteamUIStore?.WindowStore?.SteamUIWindows || [])) {
|
||||
self.wrap(win?.VirtualKeyboardManager);
|
||||
const value = win?.VirtualKeyboardManager?.IsShowingVirtualKeyboard;
|
||||
if (!value) continue;
|
||||
if (!self.watched.has(value) && typeof value.Subscribe === "function") {
|
||||
@@ -626,6 +673,29 @@ KEYBOARD_JS = r"""
|
||||
return self.check();
|
||||
})()
|
||||
""".replace("__BINDING__", KEYBOARD_BINDING)
|
||||
KEYBOARD_ROUTE_SECONDS = 0.5
|
||||
KEYBOARD_ROUTE_JS = r"""
|
||||
(route => {
|
||||
const self = window.__droiddeckKeyboard;
|
||||
if (!self) return false;
|
||||
self.route = route;
|
||||
if (!route) return true;
|
||||
for (const win of Array.from(globalThis.SteamUIStore?.WindowStore?.SteamUIWindows || [])) {
|
||||
const vkm = win?.VirtualKeyboardManager;
|
||||
if (vkm?.m_bIsInlineVirtualKeyboardOpen?.m_currentValue === true && vkm?.m_bIsVirtualKeyboardModal?.m_currentValue !== true &&
|
||||
typeof vkm.SetVirtualKeyboardHidden === "function") {
|
||||
const ref = vkm.m_currentVirtualKeyboardRef, props = vkm.m_ActiveElementProps;
|
||||
vkm.SetVirtualKeyboardHidden();
|
||||
if (ref && typeof vkm.SetActiveVirtualKeyboardTarget === "function") {
|
||||
vkm.SetActiveVirtualKeyboardTarget(ref, props);
|
||||
if (typeof self.follow === "function") self.follow(vkm);
|
||||
}
|
||||
if (typeof window.__BINDING__ === "function") window.__BINDING__("request");
|
||||
}
|
||||
}
|
||||
return true;
|
||||
})(__ROUTE__)
|
||||
""".replace("__BINDING__", KEYBOARD_BINDING)
|
||||
|
||||
|
||||
class KeyboardWatcher(threading.Thread):
|
||||
@@ -633,8 +703,14 @@ class KeyboardWatcher(threading.Thread):
|
||||
super().__init__(daemon=True, name="keyboard")
|
||||
self.agent_dir = agent_dir
|
||||
self.path = agent_dir / "keyboard.json"
|
||||
self.request_path = agent_dir / "keyboard-request.json"
|
||||
self.dismiss_path = agent_dir / "keyboard-dismiss.json"
|
||||
self.dismissals = 0
|
||||
self.route_path = agent_dir / "keyboard-route"
|
||||
self.showing = None
|
||||
self.seq = 0
|
||||
self.requests = 0
|
||||
self.route = None
|
||||
self.next_id = 0
|
||||
self.attached = False
|
||||
|
||||
@@ -645,6 +721,30 @@ class KeyboardWatcher(threading.Thread):
|
||||
self.seq += 1
|
||||
write_json(self.path, {"steamKeyboard": showing, "seq": self.seq})
|
||||
|
||||
def request(self):
|
||||
self.requests += 1
|
||||
write_json(self.request_path, {"seq": self.requests})
|
||||
|
||||
def dismiss(self):
|
||||
self.dismissals += 1
|
||||
write_json(self.dismiss_path, {"seq": self.dismissals})
|
||||
|
||||
def wanted_route(self):
|
||||
try:
|
||||
return self.route_path.read_text().strip() == "bottom"
|
||||
except OSError:
|
||||
return False
|
||||
|
||||
def apply_route(self, ws, force=False):
|
||||
route = self.wanted_route()
|
||||
if route == self.route and not force:
|
||||
return
|
||||
result = self.call(ws, "Runtime.evaluate", {
|
||||
"expression": KEYBOARD_ROUTE_JS.replace("__ROUTE__", "true" if route else "false"), "returnByValue": True})
|
||||
if result.get("exceptionDetails"):
|
||||
raise AgentError("JS_EXCEPTION", json.dumps(result["exceptionDetails"])[:500])
|
||||
self.route = route
|
||||
|
||||
def run(self):
|
||||
failures, last = 0, None
|
||||
while True:
|
||||
@@ -671,10 +771,18 @@ class KeyboardWatcher(threading.Thread):
|
||||
try:
|
||||
self.call(ws, "Runtime.addBinding", {"name": KEYBOARD_BINDING})
|
||||
self.report(self.install(ws))
|
||||
self.apply_route(ws, force=True)
|
||||
self.attached = True
|
||||
installed = time.monotonic()
|
||||
while True:
|
||||
if not ws.buffer and not select.select([ws.s], [], [], KEYBOARD_CHECK_SECONDS)[0]:
|
||||
self.report(self.install(ws))
|
||||
wait = min(KEYBOARD_ROUTE_SECONDS, KEYBOARD_CHECK_SECONDS)
|
||||
if not ws.buffer and not select.select([ws.s], [], [], wait)[0]:
|
||||
if time.monotonic() - installed >= KEYBOARD_CHECK_SECONDS:
|
||||
self.report(self.install(ws))
|
||||
self.apply_route(ws, force=True)
|
||||
installed = time.monotonic()
|
||||
else:
|
||||
self.apply_route(ws)
|
||||
continue
|
||||
self.event(json.loads(ws.recv()))
|
||||
finally:
|
||||
@@ -702,7 +810,12 @@ class KeyboardWatcher(threading.Thread):
|
||||
def event(self, message):
|
||||
params = message.get("params") or {}
|
||||
if message.get("method") == "Runtime.bindingCalled" and params.get("name") == KEYBOARD_BINDING:
|
||||
self.report(params.get("payload") == "true")
|
||||
if params.get("payload") == "request":
|
||||
self.request()
|
||||
elif params.get("payload") == "dismiss":
|
||||
self.dismiss()
|
||||
else:
|
||||
self.report(params.get("payload") == "true")
|
||||
|
||||
|
||||
def steam_idle_inhibit(agent_dir, inhibit):
|
||||
|
||||
@@ -635,6 +635,165 @@ class SteamKeyboardTest(unittest.TestCase):
|
||||
self.assertFalse(watcher.attached)
|
||||
self.assertEqual(3, log.call_count)
|
||||
|
||||
def test_requests_and_route_files(self):
|
||||
watcher = agent.KeyboardWatcher(self.dir)
|
||||
watcher.request()
|
||||
watcher.request()
|
||||
self.assertEqual({"seq": 2}, json.loads((self.dir / "keyboard-request.json").read_text()))
|
||||
self.assertFalse(watcher.wanted_route())
|
||||
(self.dir / "keyboard-route").write_text("bottom")
|
||||
self.assertTrue(watcher.wanted_route())
|
||||
(self.dir / "keyboard-route").write_text("top")
|
||||
self.assertFalse(watcher.wanted_route())
|
||||
watcher.event({"method": "Runtime.bindingCalled", "params": {"name": agent.KEYBOARD_BINDING, "payload": "request"}})
|
||||
self.assertEqual({"seq": 3}, json.loads((self.dir / "keyboard-request.json").read_text()))
|
||||
self.assertIsNone(self.state())
|
||||
|
||||
def test_dismissals_are_written_for_the_app(self):
|
||||
watcher = agent.KeyboardWatcher(self.dir)
|
||||
watcher.event({"method": "Runtime.bindingCalled", "params": {"name": agent.KEYBOARD_BINDING, "payload": "dismiss"}})
|
||||
watcher.event({"method": "Runtime.bindingCalled", "params": {"name": agent.KEYBOARD_BINDING, "payload": "dismiss"}})
|
||||
self.assertEqual({"seq": 2}, json.loads((self.dir / "keyboard-dismiss.json").read_text()))
|
||||
self.assertFalse((self.dir / "keyboard-request.json").exists())
|
||||
|
||||
@unittest.skipUnless(shutil.which("node"), "node is not installed")
|
||||
def test_page_script_reports_when_the_routed_field_loses_focus(self):
|
||||
harness = r"""
|
||||
const assert = require('assert');
|
||||
globalThis.window = globalThis;
|
||||
const fs = require('fs');
|
||||
const script = fs.readFileSync(process.argv[2], 'utf8');
|
||||
const route = fs.readFileSync(process.argv[3], 'utf8');
|
||||
const calls = [];
|
||||
window.droiddeckSteamKeyboard = value => calls.push(value);
|
||||
const open = { m_currentValue: false };
|
||||
const vkm = {
|
||||
m_currentVirtualKeyboardRef: null,
|
||||
IsShowingVirtualKeyboard: { m_currentValue: false },
|
||||
m_bIsInlineVirtualKeyboardOpen: open,
|
||||
m_bIsVirtualKeyboardModal: { m_currentValue: false },
|
||||
BUseVRKeyboard: () => false,
|
||||
m_Instance: { IsDesktopOverlayWindow: () => false },
|
||||
SetActiveVirtualKeyboardTarget(ref, props) { this.m_currentVirtualKeyboardRef = ref; },
|
||||
SetVirtualKeyboardHidden() { open.m_currentValue = false; this.m_currentVirtualKeyboardRef = null; },
|
||||
ShowVirtualKeyboard(ref, props, modal) { this.m_currentVirtualKeyboardRef = ref; open.m_currentValue = true; },
|
||||
};
|
||||
globalThis.SteamUIStore = { WindowStore: { SteamUIWindows: [{ VirtualKeyboardManager: vkm }] } };
|
||||
eval(script);
|
||||
vkm.ShowVirtualKeyboard('a', {}, false);
|
||||
eval(route.replace('__ROUTE__', 'true'));
|
||||
assert.strictEqual(open.m_currentValue, false);
|
||||
assert.strictEqual(vkm.m_currentVirtualKeyboardRef, 'a');
|
||||
const wait = ms => new Promise(done => setTimeout(done, ms));
|
||||
(async () => {
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), []);
|
||||
vkm.m_currentVirtualKeyboardRef = null;
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss']);
|
||||
vkm.ShowVirtualKeyboard('b', {}, false);
|
||||
assert.strictEqual(open.m_currentValue, false);
|
||||
vkm.m_currentVirtualKeyboardRef = null;
|
||||
await wait(160);
|
||||
vkm.ShowVirtualKeyboard('c', {}, false);
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss']);
|
||||
vkm.m_currentVirtualKeyboardRef = null;
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss']);
|
||||
let focused = false;
|
||||
vkm.ShowVirtualKeyboard({ BIsElementValidForInput: () => focused }, {}, false);
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss']);
|
||||
focused = true;
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss']);
|
||||
focused = false;
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss', 'dismiss']);
|
||||
const doc = { activeElement: { tagName: 'INPUT', type: 'text' } };
|
||||
vkm.m_ownerWindow = { document: doc };
|
||||
vkm.ShowVirtualKeyboard({ BIsElementValidForInput: () => false }, {}, false);
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss', 'dismiss']);
|
||||
doc.activeElement = { tagName: 'DIV' };
|
||||
await wait(500);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'dismiss'), ['dismiss', 'dismiss', 'dismiss', 'dismiss']);
|
||||
clearInterval(window.__droiddeckKeyboard.timer);
|
||||
})().catch(e => { console.error(e); process.exit(1); });
|
||||
"""
|
||||
(self.dir / "keyboard.js").write_text(agent.KEYBOARD_JS)
|
||||
(self.dir / "route.js").write_text(agent.KEYBOARD_ROUTE_JS)
|
||||
(self.dir / "harness.js").write_text(harness)
|
||||
result = subprocess.run(["node", str(self.dir / "harness.js"), str(self.dir / "keyboard.js"), str(self.dir / "route.js")],
|
||||
capture_output=True, text=True, timeout=20)
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
|
||||
def test_route_is_applied_once_per_change(self):
|
||||
watcher = agent.KeyboardWatcher(self.dir)
|
||||
sent = []
|
||||
with patch.object(watcher, "call", side_effect=lambda ws, method, params: sent.append(params["expression"]) or {}):
|
||||
watcher.apply_route(None)
|
||||
watcher.apply_route(None)
|
||||
(self.dir / "keyboard-route").write_text("bottom")
|
||||
watcher.apply_route(None)
|
||||
watcher.apply_route(None, force=True)
|
||||
self.assertEqual(3, len(sent))
|
||||
self.assertTrue(sent[0].rstrip().endswith("(false)"))
|
||||
self.assertTrue(sent[1].rstrip().endswith("(true)"))
|
||||
self.assertNotIn("__ROUTE__", sent[2])
|
||||
self.assertNotIn("__BINDING__", sent[2])
|
||||
|
||||
@unittest.skipUnless(shutil.which("node"), "node is not installed")
|
||||
def test_page_script_routes_the_keyboard_to_the_app(self):
|
||||
harness = r"""
|
||||
const assert = require('assert');
|
||||
globalThis.window = globalThis;
|
||||
const fs = require('fs');
|
||||
const script = fs.readFileSync(process.argv[2], 'utf8');
|
||||
const route = fs.readFileSync(process.argv[3], 'utf8');
|
||||
const calls = [];
|
||||
window.droiddeckSteamKeyboard = value => calls.push(value);
|
||||
const shown = [], targets = [];
|
||||
const open = { m_currentValue: false };
|
||||
const vkm = {
|
||||
IsShowingVirtualKeyboard: { m_currentValue: false },
|
||||
m_bIsInlineVirtualKeyboardOpen: open,
|
||||
m_bIsVirtualKeyboardModal: { m_currentValue: false },
|
||||
BUseVRKeyboard: () => false,
|
||||
m_Instance: { IsDesktopOverlayWindow: () => false },
|
||||
SetActiveVirtualKeyboardTarget(ref, props) { targets.push(ref); },
|
||||
SetVirtualKeyboardHidden() { open.m_currentValue = false; },
|
||||
ShowVirtualKeyboard(ref, props, modal) { shown.push(ref); open.m_currentValue = true; },
|
||||
};
|
||||
globalThis.SteamUIStore = { WindowStore: { SteamUIWindows: [{ VirtualKeyboardManager: vkm }] } };
|
||||
eval(script);
|
||||
vkm.ShowVirtualKeyboard('a', {}, false);
|
||||
assert.deepStrictEqual(shown, ['a']);
|
||||
assert.strictEqual(eval(route.replace('__ROUTE__', 'true')), true);
|
||||
assert.strictEqual(open.m_currentValue, false);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'request'), ['request']);
|
||||
vkm.ShowVirtualKeyboard('b', {}, false);
|
||||
assert.deepStrictEqual(shown, ['a']);
|
||||
assert.deepStrictEqual(targets, ['b']);
|
||||
assert.deepStrictEqual(calls.filter(c => c === 'request'), ['request', 'request']);
|
||||
vkm.ShowVirtualKeyboard('c', {}, true);
|
||||
assert.deepStrictEqual(shown, ['a', 'c']);
|
||||
eval(script);
|
||||
vkm.ShowVirtualKeyboard('d', {}, false);
|
||||
assert.deepStrictEqual(targets, ['b', 'd']);
|
||||
eval(route.replace('__ROUTE__', 'false'));
|
||||
vkm.ShowVirtualKeyboard('e', {}, false);
|
||||
assert.deepStrictEqual(shown, ['a', 'c', 'e']);
|
||||
clearInterval(window.__droiddeckKeyboard.timer);
|
||||
"""
|
||||
(self.dir / "keyboard.js").write_text(agent.KEYBOARD_JS)
|
||||
(self.dir / "route.js").write_text(agent.KEYBOARD_ROUTE_JS)
|
||||
(self.dir / "harness.js").write_text(harness)
|
||||
result = subprocess.run(["node", str(self.dir / "harness.js"), str(self.dir / "keyboard.js"), str(self.dir / "route.js")],
|
||||
capture_output=True, text=True, timeout=20)
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
|
||||
def test_no_shared_context_yet(self):
|
||||
with patch.object(agent, "cdp_targets", return_value=[{"title": "Steam", "webSocketDebuggerUrl": "ws://127.0.0.1:1/x"}]):
|
||||
with self.assertRaises(agent.AgentError) as caught:
|
||||
|
||||
Reference in new issue
Block a user