fix(session): address review on the landscape and portrait resolution split

Accept generated portrait sizes on reload, use the right orientation and output target when deciding follow screen, show the real size behind each Follow option, treat a saved portrait Desktop resolution as chosen, and update the orientation hint in every locale.
This commit is contained in:
FX192 committed 2026-11-21 22:46:45 +03:00
1 parent 50dace9958
commit a9054aac3f
38 files changed
+78 -42

No files matched your search

@@ -2956,16 +2956,28 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
WaylandCompositor.nativeResizeOutput(size.first, size.second)
}
private fun followPortrait(): Boolean {
if (glassesScreen != null) return false
if (::sessionRoot.isInitialized && sessionRoot.width > 0) return portraitOutput()
val portraitWindow = SessionPrefs.portrait(this)
val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this)
val long = maxOf(panel.first, panel.second)
val short = minOf(panel.first, panel.second)
val below = SessionPrefs.controlsBelowWanted(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM,
if (portraitWindow) short else long, if (portraitWindow) long else short)
return portraitWindow && !below
}
private fun followScale(): Float {
val mode = displayMode()
val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portraitOutput())
val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), followPortrait())
return com.droiddeck.launcher.session.SessionDisplay.followScale(choice) ?: 1f
}
private fun followChoice(): Boolean {
val mode = displayMode()
return com.droiddeck.launcher.session.SessionDisplay.isFollow(
SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portraitOutput()))
SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), followPortrait()))
}
private fun applyFollowOrientation(config: android.content.res.Configuration) {
@@ -1310,9 +1310,13 @@ object SessionPrefs {
val value = prefs(context).getString("displayResolution.portrait.$mode", null) ?: return SessionDisplay.LINK_LANDSCAPE
if (value == SessionDisplay.LINK_LANDSCAPE || value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) ||
SessionDisplay.presetHeight(value) != null) return value
return parseResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE
return parseOrientedResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE
}
private fun parseOrientedResolution(text: String): Pair<Int, Int>? =
parseResolution(text) ?: text.trim().split('x', 'X', '×', '*').takeIf { it.size == 2 }
?.let { parseResolution("${it[1]}x${it[0]}") }?.let { it.second to it.first }
private fun landscapeResolutionStored(context: Context, mode: String, panel: Pair<Int, Int>): String {
val saved = prefs(context)
saved.getString("displayResolution.$mode", null)?.let { value ->
@@ -1332,7 +1336,7 @@ object SessionPrefs {
val link = if (portrait) SessionDisplay.LINK_LANDSCAPE else SessionDisplay.LINK_PORTRAIT
val value = if (choice == link || choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) ||
SessionDisplay.presetHeight(choice) != null) choice else {
val size = requireNotNull(parseResolution(choice)) { "Invalid resolution" }
val size = requireNotNull(if (portrait) parseOrientedResolution(choice) else parseResolution(choice)) { "Invalid resolution" }
"${size.first}x${size.second}"
}
val panel = SessionDisplay.panelSize(context)
@@ -1982,7 +1986,7 @@ object SessionPrefs {
fun displayMode(context: Context, mode: String, program: String?): String =
if (mode == SessionService.MODE_RUN && com.droiddeck.launcher.runtime.UserApps.launches(program) &&
resolutionChosen(context, SessionService.MODE_DESKTOP)) SessionService.MODE_DESKTOP
(resolutionChosen(context, SessionService.MODE_DESKTOP) || resolutionChosen(context, SessionService.MODE_DESKTOP, true))) SessionService.MODE_DESKTOP
else prefMode(mode)
fun pipAutoEnter(context: Context): Boolean = prefs(context).getBoolean("pipAutoEnter", true)
@@ -243,9 +243,13 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras:
val displaySize = sessionDisplay.resolveChoice(s.panelSize, activeChoice, portrait)
SettingsGroup(stringResource(R.string.display_session)) {
ResolutionRow(host, "resolution", stringResource(R.string.display_resolution_landscape), s.resolution, landscapeChoice,
com.droiddeck.launcher.session.SessionDisplay.LINK_PORTRAIT, s.panelSize, a.onResolution, portrait = false)
com.droiddeck.launcher.session.SessionDisplay.LINK_PORTRAIT,
if (sessionDisplay.isLink(s.resolutionPortrait)) landscapeChoice else sessionDisplay.orientCustom(s.resolutionPortrait, false),
s.panelSize, a.onResolution, portrait = false)
ResolutionRow(host, "resolution-portrait", stringResource(R.string.display_resolution_portrait), s.resolutionPortrait, portraitChoice,
com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE, s.panelSize, a.onResolutionPortrait, portrait = true)
com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE,
if (sessionDisplay.isLink(s.resolution)) portraitChoice else sessionDisplay.orientCustom(s.resolution, true),
s.panelSize, a.onResolutionPortrait, portrait = true)
s.picturePosition?.let { position ->
ChoiceRow(host, "picture-position", stringResource(R.string.display_picture_position), null,
listOf("top" to stringResource(R.string.display_position_top),
@@ -12,7 +12,7 @@ import com.droiddeck.launcher.session.SessionDisplay
@Composable
fun ResolutionRow(
host: MenuHost, id: String, title: String, stored: String, choice: String, link: String,
host: MenuHost, id: String, title: String, stored: String, choice: String, link: String, followTarget: String,
panel: Pair<Int, Int>, onPick: (String) -> Unit,
chipModifier: Modifier = Modifier,
portrait: Boolean = false,
@@ -27,8 +27,9 @@ fun ResolutionRow(
else if (size == screen) SessionDisplay.MATCH_SCREEN else choice
var editCustom by remember { mutableStateOf(false) }
var editFollow by remember { mutableStateOf(false) }
val followSize = SessionDisplay.resolveChoice(panel, followTarget, portrait)
val linkLabel = stringResource(if (link == SessionDisplay.LINK_LANDSCAPE) R.string.display_follow_landscape else R.string.display_follow_portrait,
size.first, size.second)
followSize.first, followSize.second)
val options = listOf(link to linkLabel) + choices.map { value ->
val dimensions = SessionDisplay.resolveChoice(panel, value, portrait)
value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second)
+1 -1
View File
@@ -964,7 +964,7 @@
<string name="setup_launcher_orientation_auto">اتّباع تدوير الجهاز</string>
<string name="setup_orientation_portrait">عمودي</string>
<string name="setup_session_orientation">اتجاه الجلسة</string>
<string name="setup_session_orientation_hint">يُطبَّق على Steam والألعاب وسطح المكتب ومحرّر وحدة التحكم. تدور الدقّات المُعدّة مسبقًا مع الجلسة، ويبقى العرض والارتفاع المخصّصان كما أُدخلا.</string>
<string name="setup_session_orientation_hint">يُطبَّق على Steam والألعاب وسطح المكتب ومحرّر وحدة التحكم. تدور الدقّات المُعدّة مسبقًا مع الجلسة، وعندما يتبع أحد الاتجاهين الآخر ينعكس العرض والارتفاع المخصّصان ليتطابقا.</string>
<string name="setup_orientation_auto">أفقي تلقائي</string>
<string name="setup_orientation_landscape">أفقي</string>
<string name="setup_orientation_reverse">أفقي معكوس</string>
+1 -1
View File
@@ -982,7 +982,7 @@
<string name="setup_launcher_orientation_auto">Seguir la rotación del dispositivo</string>
<string name="setup_orientation_portrait">Vertical</string>
<string name="setup_session_orientation">Orientación de la sesión</string>
<string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de controles. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se ingresaron.</string>
<string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de controles. Los ajustes predefinidos de resolución giran con la sesión; cuando una orientación sigue a la otra, el ancho y el alto personalizados se invierten para coincidir.</string>
<string name="setup_orientation_auto">Horizontal automática</string>
<string name="setup_orientation_landscape">Horizontal</string>
<string name="setup_orientation_reverse">Horizontal invertida</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Следва завъртането на устройството</string>
<string name="setup_orientation_portrait">Вертикална</string>
<string name="setup_session_orientation">Ориентация на сесията</string>
<string name="setup_session_orientation_hint">Прилага се за Steam, игрите, работния плот и редактора на контролера. Предварително зададените резолюции се завъртат със сесията; персонализираните ширина и височина остават както са въведени.</string>
<string name="setup_session_orientation_hint">Прилага се за Steam, игрите, работния плот и редактора на контролера. Предварително зададените резолюции се завъртат със сесията; когато едната ориентация следва другата, персонализираните ширина и височина се разменят, за да съвпадат.</string>
<string name="setup_orientation_auto">Автоматичен хоризонтален</string>
<string name="setup_orientation_landscape">Хоризонтална</string>
<string name="setup_orientation_reverse">Обърната хоризонтална</string>
+1 -1
View File
@@ -958,7 +958,7 @@
<string name="setup_launcher_orientation_auto">Podle otočení zařízení</string>
<string name="setup_orientation_portrait">Na výšku</string>
<string name="setup_session_orientation">Orientace relace</string>
<string name="setup_session_orientation_hint">Platí pro Steam, hry, Plochu a editor ovladače. Předvolby rozlišení se otáčejí s relací; vlastní šířka a výška zůstávají, jak jsou zadány.</string>
<string name="setup_session_orientation_hint">Platí pro Steam, hry, Plochu a editor ovladače. Předvolby rozlišení se otáčejí s relací; když jedna orientace sleduje druhou, vlastní šířka a výška se prohodí, aby odpovídaly.</string>
<string name="setup_orientation_auto">Automaticky na šířku</string>
<string name="setup_orientation_landscape">Na šířku</string>
<string name="setup_orientation_reverse">Na šířku obráceně</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Følg enhedens rotation</string>
<string name="setup_orientation_portrait">Stående</string>
<string name="setup_session_orientation">Sessionens retning</string>
<string name="setup_session_orientation_hint">Gælder Steam, spil, skrivebordet og controllereditoren. Opløsningsforudindstillinger roterer med sessionen; brugerdefineret bredde og højde forbliver som angivet.</string>
<string name="setup_session_orientation_hint">Gælder Steam, spil, skrivebordet og controllereditoren. Opløsningsforudindstillinger roterer med sessionen; når den ene orientering følger den anden, byttes brugerdefineret bredde og højde, så de passer.</string>
<string name="setup_orientation_auto">Automatisk liggende</string>
<string name="setup_orientation_landscape">Liggende</string>
<string name="setup_orientation_reverse">Omvendt liggende</string>
+1 -1
View File
@@ -944,7 +944,7 @@
<string name="setup_launcher_orientation_auto">Gerätedrehung folgen</string>
<string name="setup_orientation_portrait">Hochformat</string>
<string name="setup_session_orientation">Sitzungsausrichtung</string>
<string name="setup_session_orientation_hint">Gilt für Steam, Spiele, Desktop und den Controller-Editor. Auflösungsvoreinstellungen drehen sich mit der Sitzung; eigene Breite und Höhe bleiben wie eingegeben.</string>
<string name="setup_session_orientation_hint">Gilt für Steam, Spiele, Desktop und den Controller-Editor. Auflösungsvoreinstellungen drehen sich mit der Sitzung; folgt eine Ausrichtung der anderen, werden eigene Breite und Höhe passend vertauscht.</string>
<string name="setup_orientation_auto">Automatisch Querformat</string>
<string name="setup_orientation_landscape">Querformat</string>
<string name="setup_orientation_reverse">Umgekehrtes Querformat</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Ακολουθεί την περιστροφή της συσκευής</string>
<string name="setup_orientation_portrait">Κατακόρυφος</string>
<string name="setup_session_orientation">Προσανατολισμός συνεδρίας</string>
<string name="setup_session_orientation_hint">Ισχύει για το Steam, τα παιχνίδια, την επιφάνεια εργασίας και τον επεξεργαστή χειριστηρίου. Οι προκαθορισμένες αναλύσεις περιστρέφονται με τη συνεδρία· το προσαρμοσμένο πλάτος και ύψος μένουν όπως καταχωρίστηκαν.</string>
<string name="setup_session_orientation_hint">Ισχύει για το Steam, τα παιχνίδια, την επιφάνεια εργασίας και τον επεξεργαστή χειριστηρίου. Οι προκαθορισμένες αναλύσεις περιστρέφονται με τη συνεδρία· όταν ένας προσανατολισμός ακολουθεί τον άλλον, το προσαρμοσμένο πλάτος και ύψος αντιστρέφονται ώστε να ταιριάζουν.</string>
<string name="setup_orientation_auto">Αυτόματος οριζόντιος προσανατολισμός</string>
<string name="setup_orientation_landscape">Οριζόντιος προσανατολισμός</string>
<string name="setup_orientation_reverse">Αντίστροφος οριζόντιος προσανατολισμός</string>
+1 -1
View File
@@ -955,7 +955,7 @@
<string name="setup_launcher_orientation_auto">Seguir la rotación del dispositivo</string>
<string name="setup_orientation_portrait">Vertical</string>
<string name="setup_session_orientation">Orientación de la sesión</string>
<string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de mandos. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se introdujeron.</string>
<string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de mandos. Los ajustes predefinidos de resolución giran con la sesión; cuando una orientación sigue a la otra, el ancho y el alto personalizados se invierten para coincidir.</string>
<string name="setup_orientation_auto">Horizontal automática</string>
<string name="setup_orientation_landscape">Horizontal</string>
<string name="setup_orientation_reverse">Horizontal invertida</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Seuraa laitteen kiertoa</string>
<string name="setup_orientation_portrait">Pystysuunta</string>
<string name="setup_session_orientation">Istunnon suunta</string>
<string name="setup_session_orientation_hint">Koskee Steamia, pelejä, työpöytää ja ohjainmuokkainta. Resoluution esiasetukset kääntyvät istunnon mukana; mukautettu leveys ja korkeus pysyvät syötetyn mukaisina.</string>
<string name="setup_session_orientation_hint">Koskee Steamia, pelejä, työpöytää ja ohjainmuokkainta. Resoluution esiasetukset kääntyvät istunnon mukana; kun toinen suunta seuraa toista, mukautettu leveys ja korkeus vaihtavat paikkaa vastaamaan toisiaan.</string>
<string name="setup_orientation_auto">Automaattinen vaakasuunta</string>
<string name="setup_orientation_landscape">Vaakasuunta</string>
<string name="setup_orientation_reverse">Käänteinen vaakasuunta</string>
+1 -1
View File
@@ -955,7 +955,7 @@
<string name="setup_launcher_orientation_auto">Suivre la rotation de l\'appareil</string>
<string name="setup_orientation_portrait">Portrait</string>
<string name="setup_session_orientation">Orientation de la session</string>
<string name="setup_session_orientation_hint">S\'applique à Steam, aux jeux, au bureau et à l\'éditeur de manette. Les préréglages de résolution pivotent avec la session ; la largeur et la hauteur personnalisées restent telles que saisies.</string>
<string name="setup_session_orientation_hint">S\'applique à Steam, aux jeux, au bureau et à l\'éditeur de manette. Les préréglages de résolution pivotent avec la session ; lorsqu\'une orientation suit l\'autre, la largeur et la hauteur personnalisées sont inversées pour correspondre.</string>
<string name="setup_orientation_auto">Paysage automatique</string>
<string name="setup_orientation_landscape">Paysage</string>
<string name="setup_orientation_reverse">Paysage inversé</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">डिवाइस रोटेशन के अनुसार</string>
<string name="setup_orientation_portrait">पोर्ट्रेट</string>
<string name="setup_session_orientation">सेशन ओरिएंटेशन</string>
<string name="setup_session_orientation_hint">Steam, गेम, डेस्कटॉप और कंट्रोलर एडिटर पर लागू होता है। रिज़ॉल्यूशन प्रीसेट सेशन के साथ घूमते हैं; कस्टम चौड़ाई और ऊंचाई जैसी डाली गई वैसी ही रहती हैं।</string>
<string name="setup_session_orientation_hint">Steam, गेम, डेस्कटॉप और कंट्रोलर एडिटर पर लागू होता है। रिज़ॉल्यूशन प्रीसेट सेशन के साथ घूमते हैं; जब एक ओरिएंटेशन दूसरे को फ़ॉलो करता है, तो कस्टम चौड़ाई और ऊंचाई बदलकर मेल खाती हैं।</string>
<string name="setup_orientation_auto">ऑटोमैटिक लैंडस्केप</string>
<string name="setup_orientation_landscape">लैंडस्केप</string>
<string name="setup_orientation_reverse">उलटा लैंडस्केप</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Az eszköz elforgatásának követése</string>
<string name="setup_orientation_portrait">Álló</string>
<string name="setup_session_orientation">Munkamenet tájolása</string>
<string name="setup_session_orientation_hint">A Steamre, a játékokra, az asztalra és a kontrollerszerkesztőre vonatkozik. A felbontás-előbeállítások a munkamenettel együtt forognak; az egyéni szélesség és magasság a megadott módon marad.</string>
<string name="setup_session_orientation_hint">A Steamre, a játékokra, az asztalra és a kontrollerszerkesztőre vonatkozik. A felbontás-előbeállítások a munkamenettel együtt forognak; ha az egyik tájolás a másikat követi, az egyéni szélesség és magasság felcserélődik.</string>
<string name="setup_orientation_auto">Automatikus fekvő</string>
<string name="setup_orientation_landscape">Fekvő</string>
<string name="setup_orientation_reverse">Fordított fekvő</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">Ikuti rotasi perangkat</string>
<string name="setup_orientation_portrait">Potret</string>
<string name="setup_session_orientation">Orientasi sesi</string>
<string name="setup_session_orientation_hint">Berlaku untuk Steam, gim, desktop, dan editor pengontrol. Preset resolusi ikut berputar dengan sesi; lebar dan tinggi kustom tetap seperti yang dimasukkan.</string>
<string name="setup_session_orientation_hint">Berlaku untuk Steam, gim, desktop, dan editor pengontrol. Preset resolusi ikut berputar dengan sesi; saat satu orientasi mengikuti yang lain, lebar dan tinggi kustom ditukar agar sesuai.</string>
<string name="setup_orientation_auto">Lanskap otomatis</string>
<string name="setup_orientation_landscape">Lanskap</string>
<string name="setup_orientation_reverse">Lanskap terbalik</string>
+1 -1
View File
@@ -947,7 +947,7 @@
<string name="setup_launcher_orientation_auto">Segui la rotazione del dispositivo</string>
<string name="setup_orientation_portrait">Verticale</string>
<string name="setup_session_orientation">Orientamento della sessione</string>
<string name="setup_session_orientation_hint">Si applica a Steam, ai giochi, al desktop e all\'editor del controller. I preset di risoluzione ruotano con la sessione; larghezza e altezza personalizzate restano come inserite.</string>
<string name="setup_session_orientation_hint">Si applica a Steam, ai giochi, al desktop e all\'editor del controller. I preset di risoluzione ruotano con la sessione; quando un\'orientamento segue l\'altro, larghezza e altezza personalizzate vengono invertite per corrispondere.</string>
<string name="setup_orientation_auto">Orizzontale automatico</string>
<string name="setup_orientation_landscape">Orizzontale</string>
<string name="setup_orientation_reverse">Orizzontale invertito</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">デバイスの回転に合わせる</string>
<string name="setup_orientation_portrait">縦向き</string>
<string name="setup_session_orientation">セッションの向き</string>
<string name="setup_session_orientation_hint">Steam、ゲーム、デスクトップ、コントローラーエディターに適用されます。解像度プリセットはセッションに合わせて回転し、カスタムの幅と高さは入力したとおりになります。</string>
<string name="setup_session_orientation_hint">Steam、ゲーム、デスクトップ、コントローラーエディターに適用されます。解像度プリセットはセッションに合わせて回転し、一方の向きがもう一方に従う場合、カスタムの幅と高さは向きに合わせて入れ替わります。</string>
<string name="setup_orientation_auto">横向き(自動回転)</string>
<string name="setup_orientation_landscape">横向き</string>
<string name="setup_orientation_reverse">横向き(反転)</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">기기 회전 따르기</string>
<string name="setup_orientation_portrait">세로</string>
<string name="setup_session_orientation">세션 방향</string>
<string name="setup_session_orientation_hint">Steam, 게임, 데스크톱 및 컨트롤러 편집기에 적용됩니다. 해상도 프리셋은 세션에 맞춰 회전하며, 사용자 정의 너비와 높이는 입력한 그대로 유지됩니다.</string>
<string name="setup_session_orientation_hint">Steam, 게임, 데스크톱 및 컨트롤러 편집기에 적용됩니다. 해상도 프리셋은 세션에 맞춰 회전하며, 한 방향이 다른 방향을 따를 때 사용자 정의 너비와 높이는 방향에 맞게 서로 바뀝니다.</string>
<string name="setup_orientation_auto">자동 가로 모드</string>
<string name="setup_orientation_landscape">가로 모드</string>
<string name="setup_orientation_reverse">역방향 가로 모드</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">Ikut putaran peranti</string>
<string name="setup_orientation_portrait">Potret</string>
<string name="setup_session_orientation">Orientasi sesi</string>
<string name="setup_session_orientation_hint">Berkuat kuasa pada Steam, permainan, desktop dan editor pengawal. Pratetap resolusi berputar bersama sesi; lebar dan tinggi tersuai kekal seperti yang dimasukkan.</string>
<string name="setup_session_orientation_hint">Berkuat kuasa pada Steam, permainan, desktop dan editor pengawal. Pratetap resolusi berputar bersama sesi; apabila satu orientasi mengikuti yang lain, lebar dan tinggi tersuai ditukar supaya sepadan.</string>
<string name="setup_orientation_auto">Lanskap automatik</string>
<string name="setup_orientation_landscape">Lanskap</string>
<string name="setup_orientation_reverse">Lanskap songsang</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Følg enhetens rotasjon</string>
<string name="setup_orientation_portrait">Stående</string>
<string name="setup_session_orientation">Retning for sesjonen</string>
<string name="setup_session_orientation_hint">Gjelder Steam, spill, skrivebordet og kontrollerredigeringen. Forhåndsinnstilte oppløsninger roterer med sesjonen; egendefinert bredde og høyde forblir som angitt.</string>
<string name="setup_session_orientation_hint">Gjelder Steam, spill, skrivebordet og kontrollerredigeringen. Forhåndsinnstilte oppløsninger roterer med sesjonen; når én retning følger den andre, byttes egendefinert bredde og høyde slik at de passer.</string>
<string name="setup_orientation_auto">Automatisk liggende</string>
<string name="setup_orientation_landscape">Liggende</string>
<string name="setup_orientation_reverse">Omvendt liggende</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Apparaatrotatie volgen</string>
<string name="setup_orientation_portrait">Staand</string>
<string name="setup_session_orientation">Oriëntatie van sessie</string>
<string name="setup_session_orientation_hint">Geldt voor Steam, games, desktop en de controllereditor. Resolutievoorinstellingen draaien mee met de sessie; aangepaste breedte en hoogte blijven zoals ingevoerd.</string>
<string name="setup_session_orientation_hint">Geldt voor Steam, games, desktop en de controllereditor. Resolutievoorinstellingen draaien mee met de sessie; als de ene oriëntatie de andere volgt, worden aangepaste breedte en hoogte omgewisseld.</string>
<string name="setup_orientation_auto">Automatisch liggend</string>
<string name="setup_orientation_landscape">Liggend</string>
<string name="setup_orientation_reverse">Liggend omgekeerd</string>
+1 -1
View File
@@ -958,7 +958,7 @@
<string name="setup_launcher_orientation_auto">Zgodnie z obrotem urządzenia</string>
<string name="setup_orientation_portrait">Pionowa</string>
<string name="setup_session_orientation">Orientacja sesji</string>
<string name="setup_session_orientation_hint">Dotyczy Steam, gier, pulpitu i edytora kontrolera. Presety rozdzielczości obracają się z sesją; własna szerokość i wysokość pozostają jak wpisano.</string>
<string name="setup_session_orientation_hint">Dotyczy Steam, gier, pulpitu i edytora kontrolera. Presety rozdzielczości obracają się z sesją; gdy jedna orientacja podąża za drugą, własna szerokość i wysokość są zamieniane.</string>
<string name="setup_orientation_auto">Automatyczna pozioma</string>
<string name="setup_orientation_landscape">Pozioma</string>
<string name="setup_orientation_reverse">Odwrócona pozioma</string>
+1 -1
View File
@@ -947,7 +947,7 @@
<string name="setup_launcher_orientation_auto">Seguir a rotação do dispositivo</string>
<string name="setup_orientation_portrait">Vertical</string>
<string name="setup_session_orientation">Orientação da sessão</string>
<string name="setup_session_orientation_hint">Aplica-se ao Steam, aos jogos, ao ambiente de trabalho e ao editor de comandos. As predefinições de resolução rodam com a sessão; a largura e a altura personalizadas ficam como foram introduzidas.</string>
<string name="setup_session_orientation_hint">Aplica-se ao Steam, aos jogos, ao ambiente de trabalho e ao editor de comandos. As predefinições de resolução rodam com a sessão; quando uma orientação segue a outra, a largura e a altura personalizadas são trocadas para corresponder.</string>
<string name="setup_orientation_auto">Horizontal automática</string>
<string name="setup_orientation_landscape">Horizontal</string>
<string name="setup_orientation_reverse">Horizontal invertida</string>
+1 -1
View File
@@ -954,7 +954,7 @@
<string name="setup_launcher_orientation_auto">Seguir a rotação do dispositivo</string>
<string name="setup_orientation_portrait">Retrato</string>
<string name="setup_session_orientation">Orientação da sessão</string>
<string name="setup_session_orientation_hint">Vale para a Steam, os jogos, a área de trabalho e o editor de controle. As predefinições de resolução giram com a sessão; largura e altura personalizadas ficam como foram digitadas.</string>
<string name="setup_session_orientation_hint">Vale para a Steam, os jogos, a área de trabalho e o editor de controle. As predefinições de resolução giram com a sessão; quando uma orientação segue a outra, largura e altura personalizadas são trocadas para corresponder.</string>
<string name="setup_orientation_auto">Paisagem automática</string>
<string name="setup_orientation_landscape">Paisagem</string>
<string name="setup_orientation_reverse">Paisagem invertida</string>
+1 -1
View File
@@ -955,7 +955,7 @@
<string name="setup_launcher_orientation_auto">Urmează rotirea dispozitivului</string>
<string name="setup_orientation_portrait">Portret</string>
<string name="setup_session_orientation">Orientarea sesiunii</string>
<string name="setup_session_orientation_hint">Se aplică pentru Steam, jocuri, desktop și editorul de controller. Presetările de rezoluție se rotesc odată cu sesiunea; lățimea și înălțimea personalizate rămân cum au fost introduse.</string>
<string name="setup_session_orientation_hint">Se aplică pentru Steam, jocuri, desktop și editorul de controller. Presetările de rezoluție se rotesc odată cu sesiunea; când o orientare o urmează pe cealaltă, lățimea și înălțimea personalizate se inversează pentru a se potrivi.</string>
<string name="setup_orientation_auto">Peisaj automat</string>
<string name="setup_orientation_landscape">Peisaj</string>
<string name="setup_orientation_reverse">Peisaj inversat</string>
+1 -1
View File
@@ -958,7 +958,7 @@
<string name="setup_launcher_orientation_auto">Следовать повороту устройства</string>
<string name="setup_orientation_portrait">Портретная</string>
<string name="setup_session_orientation">Ориентация сессии</string>
<string name="setup_session_orientation_hint">Применяется к Steam, играм, рабочему столу и редактору контроллера. Предустановки разрешения поворачиваются вместе с сессией; свои ширина и высота остаются как введены.</string>
<string name="setup_session_orientation_hint">Применяется к Steam, играм, рабочему столу и редактору контроллера. Предустановки разрешения поворачиваются вместе с сессией; когда одна ориентация следует за другой, свои ширина и высота меняются местами.</string>
<string name="setup_orientation_auto">Альбомная (авто)</string>
<string name="setup_orientation_landscape">Альбомная</string>
<string name="setup_orientation_reverse">Перевернутая альбомная</string>
+1 -1
View File
@@ -952,7 +952,7 @@
<string name="setup_launcher_orientation_auto">Följ enhetens rotation</string>
<string name="setup_orientation_portrait">Stående</string>
<string name="setup_session_orientation">Sessionens orientering</string>
<string name="setup_session_orientation_hint">Gäller Steam, spel, skrivbordet och kontrollredigeraren. Upplösningsförinställningar roterar med sessionen; anpassad bredd och höjd förblir som angivet.</string>
<string name="setup_session_orientation_hint">Gäller Steam, spel, skrivbordet och kontrollredigeraren. Upplösningsförinställningar roterar med sessionen; när en orientering följer den andra byts anpassad bredd och höjd så att de passar.</string>
<string name="setup_orientation_auto">Automatiskt liggande</string>
<string name="setup_orientation_landscape">Liggande</string>
<string name="setup_orientation_reverse">Liggande, upp och ned</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">หมุนตามอุปกรณ์</string>
<string name="setup_orientation_portrait">แนวตั้ง</string>
<string name="setup_session_orientation">การวางแนวของเซสชัน</string>
<string name="setup_session_orientation_hint">มีผลกับ Steam เกม เดสก์ท็อป และตัวแก้ไขคอนโทรลเลอร์ ค่าความละเอียดที่ตั้งไว้ล่วงหน้าจะหมุนตามเซสชัน ส่วนความกว้างและความสูงที่กำหนดเองจะคงตามที่ป้อนไว้</string>
<string name="setup_session_orientation_hint">มีผลกับ Steam เกม เดสก์ท็อป และตัวแก้ไขคอนโทรลเลอร์ ค่าความละเอียดที่ตั้งไว้ล่วงหน้าจะหมุนตามเซสชัน เมื่อแนวหนึ่งตามอีกแนวหนึ่ง ความกว้างและความสูงที่กำหนดเองจะสลับกันให้ตรงกัน</string>
<string name="setup_orientation_auto">แนวนอนอัตโนมัติ</string>
<string name="setup_orientation_landscape">แนวนอน</string>
<string name="setup_orientation_reverse">แนวนอนกลับด้าน</string>
+1 -1
View File
@@ -944,7 +944,7 @@
<string name="setup_launcher_orientation_auto">Cihaz dönüşünü izle</string>
<string name="setup_orientation_portrait">Dikey</string>
<string name="setup_session_orientation">Oturum yönü</string>
<string name="setup_session_orientation_hint">Steam, oyunlar, masaüstü ve kumanda düzenleyicisi için geçerlidir. Çözünürlük ön ayarları oturumla birlikte döner; özel genişlik ve yükseklik girildiği gibi kalır.</string>
<string name="setup_session_orientation_hint">Steam, oyunlar, masaüstü ve kumanda düzenleyicisi için geçerlidir. Çözünürlük ön ayarları oturumla birlikte döner; bir yön diğerini izlediğinde özel genişlik ve yükseklik eşleşmek üzere yer değiştirir.</string>
<string name="setup_orientation_auto">Otomatik yatay</string>
<string name="setup_orientation_landscape">Yatay</string>
<string name="setup_orientation_reverse">Ters yatay</string>
+1 -1
View File
@@ -958,7 +958,7 @@
<string name="setup_launcher_orientation_auto">Слідувати повороту пристрою</string>
<string name="setup_orientation_portrait">Книжкова</string>
<string name="setup_session_orientation">Орієнтація сеансу</string>
<string name="setup_session_orientation_hint">Застосовується до Steam, ігор, робочого столу й редактора контролера. Готові роздільні здатності повертаються разом із сеансом; власні ширина й висота залишаються як введено.</string>
<string name="setup_session_orientation_hint">Застосовується до Steam, ігор, робочого столу й редактора контролера. Готові роздільні здатності повертаються разом із сеансом; коли одна орієнтація слідує за іншою, власні ширина й висота міняються місцями.</string>
<string name="setup_orientation_auto">Автоматично альбомна</string>
<string name="setup_orientation_landscape">Альбомна</string>
<string name="setup_orientation_reverse">Перевернута альбомна</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">Theo hướng xoay thiết bị</string>
<string name="setup_orientation_portrait">Dọc</string>
<string name="setup_session_orientation">Hướng màn hình phiên</string>
<string name="setup_session_orientation_hint">Áp dụng cho Steam, game, desktop và trình chỉnh sửa tay cầm. Độ phân giải đặt sẵn xoay theo phiên; chiều rộng và chiều cao tùy chỉnh giữ nguyên như đã nhập.</string>
<string name="setup_session_orientation_hint">Áp dụng cho Steam, game, desktop và trình chỉnh sửa tay cầm. Độ phân giải đặt sẵn xoay theo phiên; khi một hướng theo hướng còn lại, chiều rộng và chiều cao tùy chỉnh được hoán đổi cho khớp.</string>
<string name="setup_orientation_auto">Ngang tự động</string>
<string name="setup_orientation_landscape">Ngang</string>
<string name="setup_orientation_reverse">Ngang ngược</string>
+1 -1
View File
@@ -949,7 +949,7 @@
<string name="setup_launcher_orientation_auto">跟随设备旋转</string>
<string name="setup_orientation_portrait">竖屏</string>
<string name="setup_session_orientation">会话方向</string>
<string name="setup_session_orientation_hint">适用于 Steam、游戏、桌面和手柄编辑器。分辨率预设会随会话旋转;自定义宽度和高度保持输入值不变。</string>
<string name="setup_session_orientation_hint">适用于 Steam、游戏、桌面和手柄编辑器。分辨率预设会随会话旋转;当一个方向跟随另一个方向时,自定义宽度和高度会互换以保持一致。</string>
<string name="setup_orientation_auto">自动横屏</string>
<string name="setup_orientation_landscape">横屏</string>
<string name="setup_orientation_reverse">反向横屏</string>
+1 -1
View File
@@ -948,7 +948,7 @@
<string name="setup_launcher_orientation_auto">跟隨裝置旋轉</string>
<string name="setup_orientation_portrait">直向</string>
<string name="setup_session_orientation">會話方向</string>
<string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解像度預設會隨會話旋轉;自訂的寬度和高度則維持輸入值。</string>
<string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解像度預設會隨會話旋轉;當一個方向跟隨另一個方向時,自訂的寬度和高度會互換以保持一致。</string>
<string name="setup_orientation_auto">自動橫向</string>
<string name="setup_orientation_landscape">橫向</string>
<string name="setup_orientation_reverse">反向橫向</string>
+1 -1
View File
@@ -948,7 +948,7 @@
<string name="setup_launcher_orientation_auto">跟隨裝置旋轉</string>
<string name="setup_orientation_portrait">直向</string>
<string name="setup_session_orientation">工作階段方向</string>
<string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解析度預設會隨工作階段旋轉;自訂的寬度和高度則維持輸入值。</string>
<string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解析度預設會隨工作階段旋轉;當一個方向跟隨另一個方向時,自訂的寬度和高度會互換以保持一致。</string>
<string name="setup_orientation_auto">自動橫向</string>
<string name="setup_orientation_landscape">橫向</string>
<string name="setup_orientation_reverse">反向橫向</string>
+1 -1
View File
@@ -1025,7 +1025,7 @@
<string name="setup_launcher_orientation_auto">Follow device rotation</string>
<string name="setup_orientation_portrait">Portrait</string>
<string name="setup_session_orientation">Session orientation</string>
<string name="setup_session_orientation_hint">Applies to Steam, games, desktop, and the controller editor. Resolution presets rotate with the session; custom width and height stay as entered.</string>
<string name="setup_session_orientation_hint">Applies to Steam, games, desktop, and the controller editor. Resolution presets rotate with the session; when one orientation follows the other, custom width and height flip to match.</string>
<string name="setup_orientation_auto">Automatic landscape</string>
<string name="setup_orientation_landscape">Landscape</string>
<string name="setup_orientation_reverse">Reverse landscape</string>
@@ -50,6 +50,21 @@ class PortraitResolutionTest {
assertFalse(SessionDisplay.isLink(SessionPrefs.resolutionStored(app, "steam", panel, true)))
}
@Test fun aGeneratedPortraitSizeSurvivesAReload() {
SessionPrefs.setResolutionChoice(app, "steam", "2560x1440")
SessionPrefs.setResolutionChoice(app, "steam", SessionDisplay.LINK_PORTRAIT)
assertEquals("1440x2560", SessionPrefs.resolutionStored(app, "steam", panel, true))
assertEquals("2560x1440", SessionPrefs.resolutionChoice(app, "steam", panel, false))
assertEquals("1440x2560", SessionPrefs.resolutionChoice(app, "steam", panel, true))
}
@Test fun aSavedDesktopResolutionInEitherOrientationCountsAsChosen() {
SessionPrefs.setResolutionChoice(app, SessionService.MODE_DESKTOP, "1080p", portrait = true)
assertTrue(SessionPrefs.resolutionChosen(app, SessionService.MODE_DESKTOP, true))
assertEquals(SessionService.MODE_DESKTOP,
SessionPrefs.displayMode(app, SessionService.MODE_RUN, com.droiddeck.launcher.runtime.UserApps.SCRIPT_LAUNCHER))
}
@Test fun modesKeepSeparateChoices() {
SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true)
assertEquals(SessionDisplay.LINK_LANDSCAPE, SessionPrefs.resolutionStored(app, "lxqt", panel, true))