From 313b6a59d2ed57e984b71822356614d6c762c70e Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 1 Nov 2026 23:14:18 -0500 Subject: [PATCH] feat(dual-screen): single-screen mode on the Retroid Pocket Duo and AYN Thor while another window holds the bottom screen (#1979) * feat(dual-screen): step aside on the Retroid Pocket Duo's bottom screen while another window holds it When the Duo's double-Home performance panel or another app (Chrome, YouTube) is on the bottom screen, DroidDeck switches to single-screen mode: the launcher's bottom panel and the in-game bottom controls close and the top screen takes its single-screen layout. When the bottom screen is back on its home screen, dual-screen mode returns, with the in-game controls reopening in the mode they had. The DroidDeck shortcuts accessibility service watches the bottom screen's windows on the Duo only. An app opened under DroidDeck's panel is caught by its window opening on that display; the Retroid panel and any app on top are read from the window list. * fix(dual-screen): log the bottom screen's holders only when they change * fix(dual-screen): the topmost window other than DroidDeck's decides who holds the bottom screen Apps opened under DroidDeck's bottom panel are still listed beneath it, so DroidDeck's own windows are skipped and the next full-size window decides. Fallback home screens such as Settings' boot-time one no longer count as a home screen. * fix(dual-screen): catch apps opened under the in-game bottom controls The in-game bottom controls hide the windows beneath them from the window list, so an app opening a window on the bottom screen while only DroidDeck is listed now holds the screen until the list can see it. * fix(dual-screen): keyboards never hold the bottom screen; watch the built-in panel only Keyboard windows opening on the bottom screen no longer count as an app arriving, so typing with the in-game bottom keyboard keeps the controls up. Only the built-in bottom panel is watched, so an external display can't close the controls. An arrival recorded while a check runs is kept for the next check, and stopping the watcher clears the held state after any running check. * feat(dual-screen): step aside on the AYN Thor's bottom screen too The bottom-screen watch now runs on every handheld in DualScreen's known dual-screen models, the Retroid Pocket Duo and the AYN Thor, including model names that extend them such as AYN Thor Max. * fix(dual-screen): only the current bottom-screen watch publishes; Thor variants match when the display type is hidden * fix: session drawer top row scrolls and Stop stays an icon-only button * fix: docked drawer drops the second-screen page; tapping the active mode returns to none * fix: docked drawer drops the bottom-screen mode icons; the Mode page keeps them * fix: restore the second-screen drawer page when docked * feat: dual screen launcher and dual screen sessions are separate Automatic/On/Off settings * fix: session drawer top row keeps its right alignment --------- Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- app/src/main/AndroidManifest.xml | 8 + .../droiddeck/launcher/FrontEndActivity.kt | 15 +- .../com/droiddeck/launcher/SessionActivity.kt | 22 ++- .../launcher/input/BottomScreenGuests.kt | 149 ++++++++++++++++++ .../droiddeck/launcher/input/DualScreen.kt | 30 +++- .../launcher/input/HomeButtonService.kt | 12 +- .../launcher/session/SessionPrefs.kt | 28 ++-- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 4 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 30 ++-- .../droiddeck/launcher/ui/SessionOverlay.kt | 63 +------- app/src/main/res/values-ar/strings.xml | 4 - app/src/main/res/values-b+es+419/strings.xml | 4 - app/src/main/res/values-bg/strings.xml | 4 - app/src/main/res/values-cs/strings.xml | 4 - app/src/main/res/values-da/strings.xml | 4 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-el/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 4 - app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-hi/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-in/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-ko/strings.xml | 4 - app/src/main/res/values-ms/strings.xml | 4 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rPT/strings.xml | 4 - app/src/main/res/values-pt/strings.xml | 4 - app/src/main/res/values-ro/strings.xml | 4 - app/src/main/res/values-ru/strings.xml | 4 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-th/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values-uk/strings.xml | 4 - app/src/main/res/values-vi/strings.xml | 4 - app/src/main/res/values-zh-rCN/strings.xml | 4 - app/src/main/res/values-zh-rHK/strings.xml | 4 - app/src/main/res/values-zh-rTW/strings.xml | 4 - app/src/main/res/values/strings.xml | 8 +- app/src/main/res/xml/home_button_service.xml | 2 +- .../launcher/input/BottomScreenGuestsTest.kt | 76 +++++++++ .../launcher/input/DualScreenTest.kt | 16 ++ 47 files changed, 358 insertions(+), 235 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e5b17b50e3..b537705617 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,14 @@ + + + + + + + + diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index eda3e08a5b..1c8c8cb9e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -549,7 +549,7 @@ class FrontEndActivity : ComponentActivity() { 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 dualScreenSessions by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) private var dualScreenControls by mutableStateOf(true) private var launcherStarted = false private lateinit var displayManager: DisplayManager @@ -558,6 +558,7 @@ class FrontEndActivity : ComponentActivity() { override fun onDisplayRemoved(displayId: Int) = refreshSecondScreenDisplays() override fun onDisplayChanged(displayId: Int) = refreshSecondScreenDisplays() } + private val bottomScreenListener: () -> Unit = { refreshSecondScreenDisplays() } private val secondScreenTouchListener = object : android.hardware.input.InputManager.InputDeviceListener { override fun onInputDeviceAdded(deviceId: Int) = refreshSecondScreenDisplays() override fun onInputDeviceRemoved(deviceId: Int) = refreshSecondScreenDisplays() @@ -1082,7 +1083,7 @@ class FrontEndActivity : ComponentActivity() { dualScreen = dualDisplayId >= 0 && com.droiddeck.launcher.ui.DualScreenPanel.available, dualScreenDevice = dualScreenDevice, dualScreenMode = dualScreenMode, - dualScreenLauncher = dualScreenLauncher, + dualScreenSessions = dualScreenSessions, dualScreenControls = dualScreenControls, packages = packageRows, packageCatalogLoading = catalogLoading, @@ -1316,8 +1317,8 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDualScreenMode(this, mode) refreshSecondScreenDisplays() }, - onDualScreenLauncher = { on -> - SessionPrefs.setDualScreenLauncher(this, on) + onDualScreenSessions = { mode -> + SessionPrefs.setDualScreenSessionMode(this, mode) refreshSecondScreenDisplays() }, onDualScreenControls = { on -> @@ -1733,6 +1734,7 @@ class FrontEndActivity : ComponentActivity() { addDataScheme("file") }) displayManager.registerDisplayListener(secondScreenDisplayListener, ui) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) getSystemService(android.hardware.input.InputManager::class.java)?.registerInputDeviceListener(secondScreenTouchListener, ui) launcherStarted = true refreshSecondScreenDisplays() @@ -1777,6 +1779,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.StoresState.libraryListener = null com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) getSystemService(android.hardware.input.InputManager::class.java)?.unregisterInputDeviceListener(secondScreenTouchListener) launcherStarted = false com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) @@ -1815,10 +1818,10 @@ class FrontEndActivity : ComponentActivity() { dualScreenMode = SessionPrefs.dualScreenMode(this) secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId) dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null - dualScreenLauncher = SessionPrefs.dualScreenLauncher(this) + dualScreenSessions = SessionPrefs.dualScreenSessionMode(this) dualScreenControls = SessionPrefs.dualScreenSessionControls(this) val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId) - dualDisplayId = if (dualScreenLauncher) target?.displayId ?: -1 else -1 + dualDisplayId = target?.displayId ?: -1 syncDualPanel() } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 1aa82d33cf..c334972670 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -475,6 +475,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var sessionActivityDisplayId = Display.DEFAULT_DISPLAY private lateinit var displayManager: DisplayManager private var secondScreenPresentation: SecondScreenPresentation? = null + private val bottomScreenListener: () -> Unit = { + if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false) + refreshSecondScreenDisplays() + } + private val displayListener = object : DisplayManager.DisplayListener { override fun onDisplayAdded(displayId: Int) { notifyActivityDisplayStateChanged(displayId) @@ -2746,15 +2751,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { 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 + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(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 + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false return try { val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also { selectedSecondScreenDisplay = target.displayId @@ -3039,7 +3043,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { 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 + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId @@ -3087,6 +3091,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) return } + if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId)) { + if (secondScreenPresentation != null) closeSecondScreen(reset = false) + secondScreenMode = mode + SessionState.secondScreenMode = mode + return + } var presentation = secondScreenPresentation if (presentation?.display?.displayId != target.displayId) { dropDockedDrawer() @@ -3295,7 +3305,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun openBottomKeyboard() { if (!started) return if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (drawerOpen) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId @@ -3977,6 +3987,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(false) refreshActivityDisplayId() displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper())) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) { contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver) } @@ -3997,6 +4008,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(true) updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) diff --git a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt new file mode 100644 index 0000000000..ae44dc0e6c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt @@ -0,0 +1,149 @@ +package com.droiddeck.launcher.input + +import android.accessibilityservice.AccessibilityService +import android.accessibilityservice.AccessibilityServiceInfo +import android.content.Intent +import android.content.pm.PackageManager +import android.graphics.Rect +import android.hardware.display.DisplayManager +import android.os.Build +import android.os.Handler +import android.os.HandlerThread +import android.util.Log +import android.view.Display +import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityWindowInfo +import android.view.inputmethod.InputMethodManager +import java.util.concurrent.ConcurrentHashMap + +object BottomScreenGuests { + enum class Top { HOME, GUEST, NONE } + + internal const val MIN_COVER = 0.5f + + internal fun classify(pkg: String?, homes: Set): Top = when (pkg) { + null -> Top.NONE + in homes -> Top.HOME + else -> Top.GUEST + } + + internal fun holder(topPkg: String?, arrival: String?, homes: Set): String? = when { + topPkg != null -> topPkg.takeIf { classify(it, homes) == Top.GUEST } + arrival != null -> arrival.takeIf { classify(it, homes) == Top.GUEST } + else -> null + } + + internal fun ignorable(type: Int): Boolean = type == AccessibilityWindowInfo.TYPE_INPUT_METHOD || + type == AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY || + type == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER || + type == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY + + fun supported(model: String = Build.MODEL, sdk: Int = Build.VERSION.SDK_INT): Boolean = + sdk >= 33 && DualScreen.yieldsBottom(model) +} + +class BottomScreenWatch(private val service: AccessibilityService) { + private class Arrival(val pkg: String) + + private val thread = HandlerThread("bottom-screen").apply { start() } + private val handler = Handler(thread.looper) + private val own = service.packageName + private val arrivals = ConcurrentHashMap() + private var homes: Set = emptySet() + private var keyboards: Set = emptySet() + private var holders: Map = emptyMap() + private val check = Runnable { evaluate() } + + fun start() { + current = this + service.serviceInfo = service.serviceInfo?.apply { + eventTypes = eventTypes or AccessibilityEvent.TYPE_WINDOWS_CHANGED or AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED + flags = flags or AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS + } + handler.post { + homes = homePackages() + keyboards = keyboardPackages() + evaluate() + } + } + + fun onEvent(event: AccessibilityEvent) { + when (event.eventType) { + AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> { + val pkg = event.packageName?.toString() ?: return + if (event.displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return + arrivals[event.displayId] = Arrival(pkg) + } + AccessibilityEvent.TYPE_WINDOWS_CHANGED -> Unit + else -> return + } + handler.removeCallbacks(check) + handler.postDelayed(check, 150) + } + + fun stop() { + handler.removeCallbacksAndMessages(null) + handler.post { + if (current === this) { + current = null + DualScreen.setTaken(emptySet()) + } + } + thread.quitSafely() + } + + private fun evaluate() { + val seen = HashMap(arrivals) + val all = runCatching { service.windowsOnAllDisplays }.getOrNull() ?: return + val displays = service.getSystemService(DisplayManager::class.java) ?: return + val taken = mutableMapOf() + for (i in 0 until all.size()) { + val id = all.keyAt(i) + if (id == Display.DEFAULT_DISPLAY) continue + val display = displays.getDisplay(id)?.takeIf(DualScreen::builtIn) ?: continue + val windows = all.valueAt(i) + val topPkg = windows.asSequence() + .filter { !BottomScreenGuests.ignorable(it.type) && cover(it, display) >= BottomScreenGuests.MIN_COVER } + .sortedByDescending { it.layer } + .firstNotNullOfOrNull { packageOf(it)?.takeUnless { pkg -> pkg == own } } + val arrival = seen[id] + if (topPkg != null && arrival != null) arrivals.remove(id, arrival) + BottomScreenGuests.holder(topPkg, arrival?.pkg?.takeUnless { it in keyboards }, homes)?.let { taken[id] = it } + } + if (current !== this) return + if (taken != holders) Log.i(TAG, "bottom screen holders: $taken") + holders = taken + DualScreen.setTaken(taken.keys) + } + + private fun cover(window: AccessibilityWindowInfo, display: Display): Float { + val bounds = Rect().also(window::getBoundsInScreen) + val area = display.mode.physicalWidth.toFloat() * display.mode.physicalHeight + return if (area <= 0f) 0f else bounds.width().toFloat() * bounds.height() / area + } + + private fun packageOf(window: AccessibilityWindowInfo): String? = + runCatching { window.getRoot(0)?.packageName?.toString() }.getOrNull() + + private fun homePackages(): Set { + val pm = service.packageManager + return listOf(Intent.CATEGORY_HOME, Intent.CATEGORY_SECONDARY_HOME).flatMap { category -> + runCatching { + pm.queryIntentActivities(Intent(Intent.ACTION_MAIN).addCategory(category), PackageManager.MATCH_ALL) + .filter { it.priority >= 0 } + .mapNotNull { it.activityInfo?.packageName } + }.getOrDefault(emptyList()) + }.toSet() + } + + private fun keyboardPackages(): Set = + runCatching { + service.getSystemService(InputMethodManager::class.java)?.inputMethodList.orEmpty().map { it.packageName }.toSet() + }.getOrDefault(emptySet()) + + private companion object { + @Volatile var current: BottomScreenWatch? = null + const val TAG = "BottomScreen" + const val SYSTEM_UI = "com.android.systemui" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt index e8d7fd71e2..cfd37c95c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt @@ -18,6 +18,23 @@ object DualScreen { private const val TYPE_INTERNAL = 1 private val knownModels = setOf("retroid pocket duo", "ayn thor") private val touchedDisplays = mutableSetOf() + private val takenListeners = java.util.concurrent.CopyOnWriteArraySet<() -> Unit>() + @Volatile private var takenDisplays: Set = emptySet() + private val main by lazy { android.os.Handler(android.os.Looper.getMainLooper()) } + + fun yieldsBottom(model: String): Boolean = model.trim().lowercase().let { m -> knownModels.any(m::startsWith) } + + fun taken(displayId: Int): Boolean = displayId in takenDisplays + + fun setTaken(ids: Set) { + if (ids == takenDisplays) return + takenDisplays = ids + main.post { takenListeners.forEach { it() } } + } + + fun watchTaken(listener: () -> Unit) { takenListeners += listener } + + fun unwatchTaken(listener: () -> Unit) { takenListeners -= listener } fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? { val primary = displayManager.getDisplay(primaryDisplayId) @@ -61,20 +78,25 @@ object DualScreen { (x.max - x.min + 1f).roundToInt() to (y.max - y.min + 1f).roundToInt() } - fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = - when (SessionPrefs.dualScreenMode(context)) { + fun sessionDisplay(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = + display(context, displayManager, primaryDisplayId, SessionPrefs.dualScreenSessionMode(context)) + + fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int, mode: String = SessionPrefs.dualScreenMode(context)): Display? = + when (mode) { MODE_OFF -> null MODE_ON -> internalDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId) else -> builtInDisplay(displayManager, primaryDisplayId) - } + }?.takeUnless { taken(it.displayId) } 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 } + fun builtIn(display: Display): Boolean = isBuiltIn(displayType(display), Build.MODEL) + internal fun isBuiltIn(type: Int?, model: String): Boolean = - if (type != null) type == TYPE_INTERNAL else model.trim().lowercase() in knownModels + if (type != null) type == TYPE_INTERNAL else yieldsBottom(model) private fun displayType(display: Display): Int? = runCatching { Display::class.java.getMethod("getType").invoke(display) as Int }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt index 61dfe32c4e..f9d9d34f4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -46,12 +46,20 @@ object HomeButtonShortcuts { } class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { + private var bottomScreen: BottomScreenWatch? = null + override fun onServiceConnected() { getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) + if (bottomScreen == null && BottomScreenGuests.supported()) bottomScreen = BottomScreenWatch(this).also { it.start() } + } + + private fun stopBottomScreen() { + bottomScreen?.stop() + bottomScreen = null } override fun onKeyEvent(event: KeyEvent) = HomeButtonShortcuts.onKeyEvent(this, event) - override fun onAccessibilityEvent(event: AccessibilityEvent?) {} + override fun onAccessibilityEvent(event: AccessibilityEvent?) { event?.let { bottomScreen?.onEvent(it) } } override fun onInterrupt() { HomeButtonShortcuts.release() } override fun onInputDeviceAdded(deviceId: Int) {} override fun onInputDeviceChanged(deviceId: Int) {} @@ -59,12 +67,14 @@ class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListen override fun onUnbind(intent: Intent?): Boolean { HomeButtonShortcuts.release() + stopBottomScreen() com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) return super.onUnbind(intent) } override fun onDestroy() { HomeButtonShortcuts.release() + stopBottomScreen() getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) super.onDestroy() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 6913143cad..bbb877f77d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -86,12 +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 + private fun savedDualScreenMode(context: Context, key: String): String? = + prefs(context).getString(key, null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } + + private fun legacyDualScreenMode(context: Context): String = + if (!prefs(context).getBoolean("dualScreenLauncher", true)) com.droiddeck.launcher.input.DualScreen.MODE_OFF + else savedDualScreenMode(context, "dualScreenMode") ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + + fun dualScreenMode(context: Context): String = legacyDualScreenMode(context) fun setDualScreenMode(context: Context, mode: String) { - prefs(context).edit().putString("dualScreenMode", mode).apply() + val sessions = dualScreenSessionMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", mode).putString("dualScreenSessionMode", sessions).apply() + } + + fun dualScreenSessionMode(context: Context): String = + savedDualScreenMode(context, "dualScreenSessionMode") ?: legacyDualScreenMode(context) + + fun setDualScreenSessionMode(context: Context, mode: String) { + val launcher = dualScreenMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", launcher).putString("dualScreenSessionMode", mode).apply() } fun secondScreenPanel(context: Context): String? = prefs(context).getString("secondScreenPanel", null) @@ -162,12 +176,6 @@ object SessionPrefs { prefs(context).edit().putStringSet("telemetryOff", keys.toSet()).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) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index b3a2223049..1c257fe297 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -12,7 +12,7 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", - "dualScreenMode", "dualScreenLauncher", "dualScreenSessionControls", + "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 0c91a88735..f40d82d391 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -133,7 +133,7 @@ class FrontEndState( val dualScreen: Boolean = false, val dualScreenDevice: Boolean = false, val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, - val dualScreenLauncher: Boolean = true, + val dualScreenSessions: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, val dualScreenControls: Boolean = true, val packages: List? = null, val packageCatalogLoading: Boolean = false, @@ -238,7 +238,7 @@ class FrontEndActions( val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onDualScreenMode: (String) -> Unit = {}, - val onDualScreenLauncher: (Boolean) -> Unit = {}, + val onDualScreenSessions: (String) -> Unit = {}, val onDualScreenControls: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 6bf7042072..16d18840d8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -435,21 +435,23 @@ internal fun SetupPanel( 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, + val dualModes = 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), ) - } - 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) } + ChoiceRow( + host, "dual-screen", stringResource(R.string.setup_dual_screen_launcher), stringResource(R.string.setup_dual_screen_launcher_hint), + dualModes, s.dualScreenMode, onPick = a.onDualScreenMode, + ) + ChoiceRow( + host, "dual-screen-sessions", stringResource(R.string.setup_dual_screen_sessions), stringResource(R.string.setup_dual_screen_sessions_hint), + dualModes, s.dualScreenSessions, onPick = a.onDualScreenSessions, + ) + if (s.dualScreenSessions != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { + 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) } + } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 81c084d6e9..8bcf13c7de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -29,6 +29,7 @@ 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.foundation.layout.widthIn import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Terminal import androidx.compose.material.icons.outlined.Dashboard @@ -475,8 +476,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont 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( @@ -876,69 +875,15 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") val shape = RoundedCornerShape(20.dp) val stopDescription = stringResource(R.string.stop_session) - val stopLabel = stringResource(R.string.drawer_stop) - var iconOnly by remember(stopLabel, androidx.compose.ui.platform.LocalConfiguration.current.screenWidthDp) { mutableStateOf(false) } Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = modifier.heightIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, + modifier = modifier.heightIn(min = 44.dp).widthIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") .clip(shape).background(fill).glideBorder(hot, shape, colors.error.copy(alpha = 0.9f), colors.error.copy(alpha = 0.55f)) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onClick) .controllerConfirm(onClick = onClick) - .padding(start = 12.dp, end = 14.dp), + .padding(horizontal = 12.dp), ) { Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp)) - if (!iconOnly) Text( - stopLabel, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error, - maxLines = 1, softWrap = false, onTextLayout = { if (it.hasVisualOverflow) iconOnly = true }, - ) - } -} - -@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) - if (a.dashboardAvailable) add(SecondScreenMode.DASHBOARD to Icons.Outlined.Dashboard) - if (a.desktopAvailable) add(SecondScreenMode.DESKTOP to Icons.Outlined.DesktopWindows) - } - 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 - }) - } - } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 73c992152e..e9cd80f9d2 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -893,13 +893,9 @@ ملء الشاشة يخفي شريطي الحالة والتنقّل في Android يعرض شريطي الحالة والتنقّل في Android - الشاشة المزدوجة - يستخدم الوضع التلقائي الشاشة الثانية في الأجهزة المحمولة التي تحتوي على شاشة مدمجة. يستخدم وضع التشغيل أي شاشة ثانية. يُبقي وضع الإيقاف كل شيء على شاشة واحدة. تلقائي تشغيل إيقاف - قائمة الشاشة السفلية - ينقل الأقسام وقائمة اللعبة إلى الشاشة الثانية ويتم الكتابة هناك، لتبقى الشاشة العلوية بعرضها الكامل. يبدّل L2 وR2 بين الأقسام. عناصر تحكم الشاشة السفلية في الألعاب يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة. الكتابة على الشاشة العلوية diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 1107fdbeab..98f67f76cd 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -911,13 +911,9 @@ Pantalla completa Oculta las barras de estado y navegación de Android Muestra las barras de estado y navegación de Android - Pantalla dual - 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. Automático Activado Desactivado - Menú en la pantalla inferior - 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. Controles en la pantalla inferior en juegos Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión. Escribiendo en la pantalla superior diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bdd38d411a..e1f8d394a5 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -881,13 +881,9 @@ Цял екран Скрива лентите за състояние и навигация на Android Показва лентите за състояние и навигация на Android - Двоен екран - Автоматично използва втория екран на преносими устройства с вграден такъв. Вкл. използва всеки втори дисплей. Изкл. държи всичко на един екран. Автоматично Вкл. Изкл. - Меню на долния екран - Премества секциите и менюто по време на игра на втория екран и въвеждането става там, така горният екран остава с пълен изглед. L2 и R2 сменят секциите. Контроли на долния екран в игрите Отваря тракпада и клавиатурата на втория екран при стартиране на сесия. Въвеждане за горния екран diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 825df28c9c..3313161ea5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -887,13 +887,9 @@ Celá obrazovka Skryje stavový a navigační panel Androidu Zobrazí stavový a navigační panel Androidu - Dvě obrazovky - 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. Automaticky Zapnuto Vypnuto - Nabídka na spodní obrazovce - 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. Ovládání na spodní obrazovce ve hrách Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce. Psaní pro horní obrazovku diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8722c4dacc..e095bfffe4 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -881,13 +881,9 @@ Fuldskærm Skjuler Androids status- og navigationsbjælker Viser Androids status- og navigationsbjælker - Dobbeltskærm - 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. Automatisk Til Fra - Menu på nederste skærm - 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. Kontroller på nederste skærm i spil Åbner pegefeltet og tastaturet på den anden skærm, når en session starter. Skriver til den øverste skærm diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a8a431e18a..1f280286a5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -873,13 +873,9 @@ Vollbild Blendet die Status- und Navigationsleiste von Android aus Zeigt die Status- und Navigationsleiste von Android an - Zwei Bildschirme - Automatisch nutzt den zweiten Bildschirm auf Handhelds mit eingebautem Zweitbildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus lässt alles auf einem Bildschirm. Automatisch Ein Aus - Menü auf dem unteren Bildschirm - 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. Steuerung auf dem unteren Bildschirm in Spielen Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm. Eingabe für den oberen Bildschirm diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index bd5bf28d64..7ffe86fd91 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -881,13 +881,9 @@ Πλήρης οθόνη Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android - Διπλή οθόνη - Το Αυτόματο χρησιμοποιεί τη δεύτερη οθόνη σε φορητές συσκευές με ενσωματωμένη. Το Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Το Ανενεργό κρατά τα πάντα σε μία οθόνη. Αυτόματο Ενεργό Ανενεργό - Μενού κάτω οθόνης - Μεταφέρει τις ενότητες και το μενού του παιχνιδιού στη δεύτερη οθόνη και η πληκτρολόγηση γίνεται εκεί, ώστε η πάνω οθόνη να κρατά την πλήρη προβολή. Τα L2 και R2 αλλάζουν ενότητα. Χειριστήρια κάτω οθόνης στα παιχνίδια Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία. Πληκτρολόγηση για την πάνω οθόνη diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8f8103644a..32acc2d900 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -884,13 +884,9 @@ Pantalla completa Oculta las barras de estado y navegación de Android Muestra las barras de estado y navegación de Android - Pantalla doble - 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. Automático Activado Desactivado - Menú en la pantalla inferior - 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. Controles en la pantalla inferior en juegos Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión. Escribiendo en la pantalla superior diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f23c31a17e..576685c47e 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -881,13 +881,9 @@ Koko näyttö Piilottaa Androidin tila- ja navigointipalkit Näyttää Androidin tila- ja navigointipalkit - Kaksi näyttöä - 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ä. Automaattinen Päällä Pois - Alanäytön valikko - 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. Alanäytön ohjaimet peleissä Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa. Kirjoitus yläruudulle diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 543e16d257..c5097f314d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -884,13 +884,9 @@ Plein écran Masquer la barre d\'état et la barre de navigation Android Afficher la barre d\'état et la barre de navigation Android - Double écran - 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. Automatique Activé Désactivé - Menu sur l\'écran du bas - 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. Commandes sur l\'écran du bas en jeu Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session. Saisie pour l\'écran du haut diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 45ef464e62..f90bd69595 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -881,13 +881,9 @@ फ़ुलस्क्रीन Android स्टेटस और नेविगेशन बार छिपाता है Android स्टेटस और नेविगेशन बार दिखाता है - डुअल स्क्रीन - ऑटोमैटिक, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड पर दूसरी स्क्रीन इस्तेमाल करता है। चालू किसी भी दूसरे डिस्प्ले का इस्तेमाल करता है। बंद सब कुछ एक स्क्रीन पर रखता है। ऑटोमैटिक चालू बंद - नीचे की स्क्रीन पर मेनू - सेक्शन और गेम के दौरान का मेनू दूसरी स्क्रीन पर ले जाता है और टाइपिंग वहीं होती है, ताकि ऊपर की स्क्रीन पूरा दृश्य दिखाए। L2 और R2 सेक्शन बदलते हैं। गेम में नीचे की स्क्रीन के कंट्रोल सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है। ऊपर की स्क्रीन के लिए टाइपिंग diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e9c693d02b..8526960ba4 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -881,13 +881,9 @@ Teljes képernyő Elrejti az Android állapot- és navigációs sávokat Megjeleníti az Android állapot- és navigációs sávokat - Két képernyő - 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. Automatikus Be Ki - Menü az alsó képernyőn - 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. Alsó képernyős vezérlők játékokban Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn. Gépelés a felső képernyőre diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index fe04ab97d8..05abf15fad 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -878,13 +878,9 @@ Layar penuh Menyembunyikan bilah status dan navigasi Android Menampilkan bilah status dan navigasi Android - Layar ganda - Otomatis memakai layar kedua pada perangkat genggam yang memiliki layar bawaan. Aktif memakai layar kedua apa pun. Nonaktif membuat semuanya tetap di satu layar. Otomatis Aktif Nonaktif - Menu layar bawah - 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. Kontrol layar bawah dalam game Membuka trackpad dan keyboard di layar kedua saat sesi dimulai. Mengetik untuk layar atas diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3dc322e7ac..a4c97d92f2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -876,13 +876,9 @@ Schermo intero Nasconde la barra di stato e la barra di navigazione di Android Mostra la barra di stato e la barra di navigazione di Android - Doppio schermo - 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. Automatico Attivo Disattivo - Menu sullo schermo inferiore - 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. Controlli sullo schermo inferiore nei giochi Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione. Digitazione per lo schermo superiore diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ea759df1f8..db8252aec4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -878,13 +878,9 @@ 全画面 Androidのステータスバーとナビゲーションバーを非表示 Androidのステータスバーとナビゲーションバーを表示 - デュアル画面 - 自動では、2画面目を内蔵した携帯機でその画面を使います。オンではどの2画面目でも使います。オフではすべてを1画面に表示します。 自動 オン オフ - 下画面メニュー - セクションとゲーム中のメニューを2画面目に移し、入力もそこで行うため、上画面は全体表示のままになります。L2とR2でセクションを切り替えます。 ゲーム中の下画面コントロール セッション開始時に2画面目にトラックパッドとキーボードを開きます。 上画面に入力中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9f3f85e373..a8e34c3988 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -878,13 +878,9 @@ 전체 화면 Android 상태 표시줄 및 탐색 표시줄 숨기기 Android 상태 표시줄 및 탐색 표시줄 표시 - 듀얼 화면 - 자동은 두 번째 화면이 내장된 휴대용 기기에서 그 화면을 사용합니다. 켜기는 모든 두 번째 디스플레이를 사용합니다. 끄기는 모든 것을 한 화면에 둡니다. 자동 켜기 끄기 - 하단 화면 메뉴 - 섹션과 게임 중 메뉴를 두 번째 화면으로 옮기고 입력도 그곳에서 하므로 상단 화면은 전체 보기를 유지합니다. L2와 R2로 섹션을 전환합니다. 게임 중 하단 화면 컨트롤 세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다. 상단 화면에 입력 중 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 43312006f7..c480939a49 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -878,13 +878,9 @@ Skrin penuh Menyembunyikan bar status dan navigasi Android Memaparkan bar status dan navigasi Android - Dwi skrin - Automatik menggunakan skrin kedua pada peranti pegang tangan yang mempunyai skrin terbina dalam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan semuanya pada satu skrin. Automatik Hidup Mati - Menu skrin bawah - 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. Kawalan skrin bawah dalam permainan Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula. Menaip untuk skrin atas diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b9be6a70aa..7d49438836 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -881,13 +881,9 @@ Fullskjerm Skjuler Androids status- og navigasjonslinjer Viser Androids status- og navigasjonslinjer - Dobbel skjerm - Automatisk bruker den andre skjermen på håndholdte enheter med innebygd skjerm. På bruker enhver annen skjerm. Av holder alt på én skjerm. Automatisk På Av - Meny på nederste skjerm - 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. Kontroller på nederste skjerm i spill Åpner styreflaten og tastaturet på den andre skjermen når en økt starter. Skriver for den øverste skjermen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 76f7aa11c3..ce3f5fdfe5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -881,13 +881,9 @@ Volledig scherm Verbergt de statusbalk en navigatiebalk van Android Toont de statusbalk en navigatiebalk van Android - Dubbel scherm - Automatisch gebruikt het tweede scherm op handhelds met een ingebouwd scherm. Aan gebruikt elk tweede scherm. Uit houdt alles op één scherm. Automatisch Aan Uit - Menu op het onderste scherm - 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. Bediening op het onderste scherm in games Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start. Typen voor het bovenste scherm diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c74e8dedfd..6cd7eef206 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -887,13 +887,9 @@ Pełny ekran Ukrywa systemowe paski stanu i nawigacji Pokazuje systemowe paski stanu i nawigacji - Dwa ekrany - 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. Automatycznie Włączone Wyłączone - Menu na dolnym ekranie - 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. Sterowanie na dolnym ekranie w grach Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji. Pisanie dla górnego ekranu diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index defb213d1d..ed5df7013e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -876,13 +876,9 @@ Ecrã inteiro Oculta as barras de estado e de navegação do Android Mostra as barras de estado e de navegação do Android - Ecrã duplo - 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ã. Automático Ativado Desativado - Menu no ecrã inferior - 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. Controlos no ecrã inferior nos jogos Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa. A escrever para o ecrã superior diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2615c5ad08..17223e030d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -876,13 +876,9 @@ Tela cheia Oculta as barras de status e de navegação do Android Mostra as barras de status e de navegação do Android - Tela dupla - 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. Automático Ativado Desativado - Menu na tela inferior - 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. Controles na tela inferior nos jogos Abre o trackpad e o teclado na segunda tela quando uma sessão começa. Digitando para a tela superior diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5e117cba6b..f46ca94f54 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -884,13 +884,9 @@ Ecran complet Ascunde barele de stare și de navigare Android Arată barele de stare și de navigare Android - Ecran dublu - 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. Automat Pornit Oprit - Meniu pe ecranul de jos - 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. Comenzi pe ecranul de jos în jocuri Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune. Scriere pentru ecranul de sus diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5fa685926d..44a3a5005e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -887,13 +887,9 @@ Полноэкранный режим Скрывает строку состояния и панель навигации Android Показывает строку состояния и панель навигации Android - Два экрана - Автоматически — использует второй экран на портативных устройствах со встроенным вторым экраном. Вкл. — использует любой второй дисплей. Выкл. — всё остаётся на одном экране. Автоматически Вкл. Выкл. - Меню на нижнем экране - Переносит разделы и меню в игре на второй экран, и ввод выполняется там, поэтому верхний экран остаётся полностью свободным. L2 и R2 переключают разделы. Управление на нижнем экране в играх Открывает тачпад и клавиатуру на втором экране при запуске сеанса. Ввод для верхнего экрана diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8f89510e47..88c1852e58 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -881,13 +881,9 @@ Helskärm Döljer Androids statusfält och navigeringsfält Visar Androids statusfält och navigeringsfält - Dubbelskärm - 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. Automatiskt På Av - Meny på nedre skärmen - 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. Kontroller på nedre skärmen i spel Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar. Skriver för den övre skärmen diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e56ececd31..0cf02f24bb 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -878,13 +878,9 @@ เต็มจอ ซ่อนแถบสถานะและแถบนำทางของ Android แสดงแถบสถานะและแถบนำทางของ Android - หน้าจอคู่ - อัตโนมัติจะใช้หน้าจอที่สองบนเครื่องพกพาที่มีหน้าจอที่สองในตัว เปิดจะใช้หน้าจอที่สองใดก็ได้ ปิดจะแสดงทุกอย่างบนหน้าจอเดียว อัตโนมัติ เปิด ปิด - เมนูหน้าจอล่าง - ย้ายส่วนต่าง ๆ และเมนูระหว่างเล่นเกมไปที่หน้าจอที่สองและพิมพ์ที่นั่น เพื่อให้หน้าจอบนแสดงเต็มพื้นที่ L2 และ R2 ใช้สลับส่วน ปุ่มควบคุมหน้าจอล่างในเกม เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน กำลังพิมพ์ให้หน้าจอบน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 380ea77773..c1aa70c7fc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -873,13 +873,9 @@ Tam ekran Android durum ve gezinme çubuklarını gizler Android durum ve gezinme çubuklarını gösterir - Çift ekran - 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. Otomatik Açık Kapalı - Alt ekran menüsü - 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. Oyunlarda alt ekran kontrolleri Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar. Üst ekran için yazılıyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d11cb4d917..ee1706bfdb 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -887,13 +887,9 @@ Повний екран Приховує рядок стану та панель навігації Android Показує рядок стану та панель навігації Android - Два екрани - Автоматично — використовує другий екран на портативних пристроях із вбудованим другим екраном. Увімк. — використовує будь-який другий дисплей. Вимк. — усе лишається на одному екрані. Автоматично Увімк. Вимк. - Меню на нижньому екрані - Переносить розділи та меню в грі на другий екран, і введення відбувається там, тож верхній екран лишається повністю вільним. L2 і R2 перемикають розділи. Керування на нижньому екрані в іграх Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу. Введення для верхнього екрана diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bd560f50d9..2cc18d5e8e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -878,13 +878,9 @@ Toàn màn hình Ẩn thanh trạng thái và thanh điều hướng của Android Hiện thanh trạng thái và thanh điều hướng của Android - Màn hình kép - 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. Tự động Bật Tắt - Menu ở màn hình dưới - 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. Điều khiển màn hình dưới khi chơi game 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. Đang nhập cho màn hình trên diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b881f1e716..f2f0f10fa9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -878,13 +878,9 @@ 全屏 隐藏 Android 状态栏和导航栏 显示 Android 状态栏和导航栏 - 双屏 - 自动:在内置第二块屏幕的掌机上使用该屏幕。开启:使用任何第二块显示器。关闭:所有内容只显示在一块屏幕上。 自动 开启 关闭 - 下屏菜单 - 将各个分区和游戏内菜单移到第二块屏幕并在那里输入,让上屏保持完整画面。L2 和 R2 切换分区。 游戏中的下屏控制 会话开始时在第二块屏幕上打开触控板和键盘。 正在为上屏输入 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index caced3676f..6af88be055 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -878,13 +878,9 @@ 全螢幕 隱藏 Android 狀態列和導覽列 顯示 Android 狀態列和導覽列 - 雙屏 - 自動:在內置第二塊螢幕的掌機上使用該螢幕。開啟:使用任何第二塊顯示器。關閉:所有內容只顯示在一塊螢幕上。 自動 開啟 關閉 - 下屏選單 - 將各個分區和遊戲內選單移到第二塊螢幕並在那裡輸入,讓上屏保持完整畫面。L2 和 R2 切換分區。 遊戲中的下屏控制 工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。 正在為上屏輸入 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ad9a72246d..74a53be9aa 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -878,13 +878,9 @@ 全螢幕 隱藏 Android 狀態列和導覽列 顯示 Android 狀態列和導覽列 - 雙螢幕 - 自動:在內建第二個螢幕的掌機上使用該螢幕。開啟:使用任何第二個顯示器。關閉:所有內容只顯示在一個螢幕上。 自動 開啟 關閉 - 下螢幕選單 - 將各個區塊和遊戲內選單移到第二個螢幕並在那裡輸入,讓上螢幕保持完整畫面。L2 和 R2 切換區塊。 遊戲中的下螢幕控制 工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。 正在為上螢幕輸入 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c30b06c8dd..e6f2f133d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -942,13 +942,13 @@ Fullscreen Hides the Android status and navigation bars Shows the Android status and navigation bars - Dual screen - Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps the launcher and games on one screen; you can still pick a second screen from the session menu. + Dual screen launcher + Automatic puts the launcher sections (Steam, Library, Stores and the rest) on the second screen of handhelds with a built-in one. On uses any second display. Off keeps the launcher on one screen. + Dual screen sessions + Automatic docks the in-game menu on the built-in second screen instead of a pop-over. On uses any second display. Off keeps the menu on the game screen; you can still pick a second screen from it. Automatic On Off - Bottom screen menu - 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. Bottom screen controls in games Opens the trackpad and keyboard on the second screen when a session starts. Typing on the top screen diff --git a/app/src/main/res/xml/home_button_service.xml b/app/src/main/res/xml/home_button_service.xml index 3b094dcd54..0c67e9effd 100644 --- a/app/src/main/res/xml/home_button_service.xml +++ b/app/src/main/res/xml/home_button_service.xml @@ -3,5 +3,5 @@ android:accessibilityFeedbackType="feedbackGeneric" android:accessibilityFlags="flagRequestFilterKeyEvents" android:canRequestFilterKeyEvents="true" - android:canRetrieveWindowContent="false" + android:canRetrieveWindowContent="true" android:description="@string/integration_shortcuts_service_description" /> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt new file mode 100644 index 0000000000..d9c959dae9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.accessibility.AccessibilityWindowInfo +import com.droiddeck.launcher.input.BottomScreenGuests.Top +import org.junit.After +import org.junit.Assert.assertEquals +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.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class BottomScreenGuestsTest { + private val homes = setOf("com.android.launcher3", "com.retroidpocket.gamelauncher") + + @After fun clear() = DualScreen.setTaken(emptySet()) + + @Test fun onlyTheRetroidPocketDuoAndAynThorWatchTheirBottomScreen() { + assertTrue(BottomScreenGuests.supported("Retroid Pocket Duo", 36)) + assertTrue(BottomScreenGuests.supported(" retroid pocket duo ", 33)) + assertFalse(BottomScreenGuests.supported("Retroid Pocket Duo", 32)) + assertTrue(BottomScreenGuests.supported("AYN Thor", 33)) + assertTrue(BottomScreenGuests.supported("AYN Thor Max", 34)) + assertFalse(BottomScreenGuests.supported("AYN Odin 2", 36)) + assertFalse(BottomScreenGuests.supported("Pixel 8", 36)) + } + + @Test fun anyWindowButTheHomeScreenHoldsTheScreen() { + assertEquals(Top.HOME, BottomScreenGuests.classify("com.android.launcher3", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.android.chrome", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.retroidpocket.dualscreen.assistant", homes)) + assertEquals(Top.NONE, BottomScreenGuests.classify(null, homes)) + } + + @Test fun theWindowListDecidesWhenItSeesPastDroidDeck() { + assertEquals("com.android.chrome", BottomScreenGuests.holder("com.android.chrome", null, homes)) + assertEquals(null, BottomScreenGuests.holder("com.android.launcher3", "com.android.chrome", homes)) + } + + @Test fun anAppOpenedUnderDroidDeckHoldsTheScreenUntilTheListSeesIt() { + assertEquals("com.google.android.youtube", BottomScreenGuests.holder(null, "com.google.android.youtube", homes)) + assertEquals(null, BottomScreenGuests.holder(null, "com.android.launcher3", homes)) + assertEquals(null, BottomScreenGuests.holder(null, null, homes)) + } + + @Test fun keyboardsAndOverlaysNeverTakeTheScreen() { + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_INPUT_METHOD)) + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_APPLICATION)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_SYSTEM)) + } + + @Test fun listenersHearWhenTheScreenIsTakenAndFreed() { + var calls = 0 + val listener: () -> Unit = { calls++ } + DualScreen.watchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertTrue(DualScreen.taken(2)) + assertFalse(DualScreen.taken(0)) + DualScreen.setTaken(setOf(2)) + DualScreen.setTaken(emptySet()) + shadowOf(Looper.getMainLooper()).idle() + assertFalse(DualScreen.taken(2)) + assertEquals(2, calls) + DualScreen.unwatchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(2, calls) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt index c5fd50d60c..e50fcbadf4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt @@ -29,6 +29,7 @@ class DualScreenTest { @Test fun knownModelsCountWhenTheTypeIsHidden() { assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo")) assertTrue(DualScreen.isBuiltIn(null, " AYN Thor ")) + assertTrue(DualScreen.isBuiltIn(null, "AYN Thor Max")) assertFalse(DualScreen.isBuiltIn(null, "Pixel 8")) } @@ -65,4 +66,19 @@ class DualScreenTest { SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) } + + @Test fun launcherAndSessionsKeepSeparateModes() { + SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenSessionMode(context)) + SessionPrefs.setDualScreenSessionMode(context, DualScreen.MODE_ON) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_ON, SessionPrefs.dualScreenSessionMode(context)) + } + + @Test fun anOldDisabledMenuToggleTurnsBothOff() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("dualScreenLauncher", false).commit() + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenSessionMode(context)) + } }