diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
index 96015e58ec..5cc912fbbe 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@@ -509,6 +509,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
gpuModel = GpuDriverHelper.getGpuModel().toString()
fwVersion = NativeLibrary.firmwareVersion()
+ updateQuickOverlayMenuEntry(BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean())
+
binding.surfaceEmulation.holder.addCallback(this)
binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
@@ -530,6 +532,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
binding.inGameMenu.requestFocus()
emulationViewModel.setDrawerOpen(true)
+ updateQuickOverlayMenuEntry(BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean())
}
override fun onDrawerClosed(drawerView: View) {
@@ -571,25 +574,24 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
R.id.menu_pause_emulation -> {
if (emulationState.isPaused) {
emulationState.run(false)
- it.title = resources.getString(R.string.emulation_pause)
- it.icon = ResourcesCompat.getDrawable(
- resources,
- R.drawable.ic_pause,
- requireContext().theme
- )
+ updatePauseMenuEntry(false)
} else {
emulationState.pause()
- it.title = resources.getString(R.string.emulation_unpause)
- it.icon = ResourcesCompat.getDrawable(
- resources,
- R.drawable.ic_play,
- requireContext().theme
- )
+ updatePauseMenuEntry(true)
}
binding.inGameMenu.requestFocus()
true
}
+ R.id.menu_quick_overlay -> {
+ val newState = !BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
+ BooleanSetting.SHOW_INPUT_OVERLAY.setBoolean(newState)
+ updateQuickOverlayMenuEntry(newState)
+ binding.surfaceInputOverlay.refreshControls()
+ NativeConfig.saveGlobalConfig()
+ true
+ }
+
R.id.menu_settings -> {
val action = HomeNavigationDirections.actionGlobalSettingsActivity(
null,
@@ -844,9 +846,50 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
}
}
+ private fun updateQuickOverlayMenuEntry(isVisible: Boolean) {
+ val menu = binding.inGameMenu.menu
+ val item = menu.findItem(R.id.menu_quick_overlay)
+ if (isVisible) {
+ item.title = getString(R.string.emulation_hide_overlay)
+ item.icon = ResourcesCompat.getDrawable(
+ resources,
+ R.drawable.ic_controller_disconnected,
+ requireContext().theme
+ )
+ } else {
+ item.title = getString(R.string.emulation_show_overlay)
+ item.icon = ResourcesCompat.getDrawable(
+ resources,
+ R.drawable.ic_controller,
+ requireContext().theme
+ )
+ }
+ }
+
+ private fun updatePauseMenuEntry(isPaused: Boolean) {
+ val menu = binding.inGameMenu.menu
+ val pauseItem = menu.findItem(R.id.menu_pause_emulation)
+ if (isPaused) {
+ pauseItem.title = getString(R.string.emulation_unpause)
+ pauseItem.icon = ResourcesCompat.getDrawable(
+ resources,
+ R.drawable.ic_play,
+ requireContext().theme
+ )
+ } else {
+ pauseItem.title = getString(R.string.emulation_pause)
+ pauseItem.icon = ResourcesCompat.getDrawable(
+ resources,
+ R.drawable.ic_pause,
+ requireContext().theme
+ )
+ }
+ }
+
override fun onPause() {
if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
emulationState.pause()
+ updatePauseMenuEntry(true)
}
super.onPause()
}
@@ -869,6 +912,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
val socPosition = IntSetting.SOC_OVERLAY_POSITION.getInt()
updateSocPosition(socPosition)
+
+ binding.inGameMenu.post {
+ emulationState?.isPaused?.let { updatePauseMenuEntry(it) }
+ }
}
private fun resetInputOverlay() {
@@ -1391,6 +1438,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
R.id.menu_show_overlay -> {
it.isChecked = !it.isChecked
BooleanSetting.SHOW_INPUT_OVERLAY.setBoolean(it.isChecked)
+ updateQuickOverlayMenuEntry(it.isChecked)
binding.surfaceInputOverlay.refreshControls()
true
}
diff --git a/src/android/app/src/main/res/menu/menu_in_game.xml b/src/android/app/src/main/res/menu/menu_in_game.xml
index ce3f11f6e6..d45699638c 100644
--- a/src/android/app/src/main/res/menu/menu_in_game.xml
+++ b/src/android/app/src/main/res/menu/menu_in_game.xml
@@ -8,6 +8,11 @@
android:icon="@drawable/ic_pause"
android:title="@string/emulation_pause" />
+
+
- مركز العصا النسبي
مزلاق الأسهم
الاهتزازات الديناميكية
- عرض التراكب
+ إظهار وحدة التحكم
+ إخفاء وحدة التحكم
الكل
ضبط التراكب
الحجم
diff --git a/src/android/app/src/main/res/values-ckb/strings.xml b/src/android/app/src/main/res/values-ckb/strings.xml
index 221a197843..34b1ae6252 100644
--- a/src/android/app/src/main/res/values-ckb/strings.xml
+++ b/src/android/app/src/main/res/values-ckb/strings.xml
@@ -710,7 +710,8 @@
ناوەندی گێڕ بەنزیکەیی
خلیسکانی 4 دوگمەکە
لەرینەوەی پەنجەلێدان
- نیشاندانی داپۆشەر
+ نیشاندانی کۆنتڕۆڵەر
+ پیشاندانی کۆنتڕۆڵەر
گۆڕینی سەرجەم
ڕێکخستنی داپۆشەر
پێوەر
diff --git a/src/android/app/src/main/res/values-cs/strings.xml b/src/android/app/src/main/res/values-cs/strings.xml
index 61e389f9fc..293524271e 100644
--- a/src/android/app/src/main/res/values-cs/strings.xml
+++ b/src/android/app/src/main/res/values-cs/strings.xml
@@ -691,7 +691,8 @@
Relativní střed joysticku
D-pad slide
Haptická odezva
- Zobrazit překryv
+ Zobrazit ovladač
+ Skrýt ovladač
Přepnout vše
Upravit překryv
Měřítko
diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml
index bff0b0379e..46ae9ba7fe 100644
--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@@ -762,6 +762,13 @@ Wirklich fortfahren?
Emulation beenden
Fertig
FPS Zähler
+
+ Steuerung umschalten
+ Relativer Stick-Zentrum
+ D-Pad-Scrollen
+ Haptisches Feedback
+ Controller anzeigen
+ Controller ausblenden
Alle umschalten
Overlay anpassen
Größe
diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml
index 888d6d1684..8712f455de 100644
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@@ -806,7 +806,8 @@
Centro relativo del stick
Deslizamiento de la cruceta
Toques hápticos
- Mostrar overlay
+ Mostrar controlador
+ Ocultar controlador
Alternar todo
Ajustar overlay
Escala
diff --git a/src/android/app/src/main/res/values-fa/strings.xml b/src/android/app/src/main/res/values-fa/strings.xml
index 60b1626aa5..07ff8ff4e0 100644
--- a/src/android/app/src/main/res/values-fa/strings.xml
+++ b/src/android/app/src/main/res/values-fa/strings.xml
@@ -805,7 +805,8 @@
مرکز نسبی استیک
لغزش دکمههای جهتی
لرزش لمسی
- نشان دادن نمایش روی صفحه
+ نمایش کنترلر
+ پنهان کردن کنترلر
تغییر همه
تنظیم نمایش روی صفحه
مقیاس
diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml
index fde02d1aa8..2e06ac98e1 100644
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@@ -854,7 +854,8 @@
Centre du stick relatif
Glissement du D-pad
Toucher haptique
- Afficher l\'overlay
+ Afficher la manette
+ Masquer la manette
Tout basculer
Ajuster l\'overlay
Échelle
diff --git a/src/android/app/src/main/res/values-he/strings.xml b/src/android/app/src/main/res/values-he/strings.xml
index 59312086e9..c0c835d633 100644
--- a/src/android/app/src/main/res/values-he/strings.xml
+++ b/src/android/app/src/main/res/values-he/strings.xml
@@ -739,7 +739,8 @@
מרכז ג׳ויסטיק יחסי
החלקת D-pad
רטט מגע
- הצג את שכבת-העל
+ הצג בקר
+ הסתר בקר
החלף הכל
התאם את שכבת-העל
קנה מידה
diff --git a/src/android/app/src/main/res/values-hu/strings.xml b/src/android/app/src/main/res/values-hu/strings.xml
index f95e2d3f97..46a5ac7cce 100644
--- a/src/android/app/src/main/res/values-hu/strings.xml
+++ b/src/android/app/src/main/res/values-hu/strings.xml
@@ -843,7 +843,8 @@
Irányítás átkapcsolása
D-pad csúsztatása
Érintés haptikája
- Átfedés mutatása
+ Vezérlő megjelenítése
+ Vezérlő elrejtése
Összes átkapcsolása
Átfedés testreszabása
Skálázás
diff --git a/src/android/app/src/main/res/values-id/strings.xml b/src/android/app/src/main/res/values-id/strings.xml
index dae77d53af..cffb526ad5 100644
--- a/src/android/app/src/main/res/values-id/strings.xml
+++ b/src/android/app/src/main/res/values-id/strings.xml
@@ -798,7 +798,8 @@
Pusat stick relatif
Geser Dpad
Haptik
- Tampilkan Hamparan
+ Tampilkan Kontroler
+ Sembunyikan Kontroler
Alihkan Semua
Menyesuaikan
Skala
diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml
index dd184e9d9a..cb234cf61e 100644
--- a/src/android/app/src/main/res/values-it/strings.xml
+++ b/src/android/app/src/main/res/values-it/strings.xml
@@ -770,7 +770,8 @@
Centro relativo degli Stick
DPad A Scorrimento
Feedback Aptico
- Mostra l\'overlay
+ Mostra l\'controller
+ Nascondi l\'controller
Attiva/Disattiva tutto
Regola l\'overlay
Scala
diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml
index 873d433fc0..abedb1e0bc 100644
--- a/src/android/app/src/main/res/values-ja/strings.xml
+++ b/src/android/app/src/main/res/values-ja/strings.xml
@@ -729,7 +729,8 @@
スティックを固定しない
十字キーをスライド操作
タッチ振動
- ボタンを表示
+ コントローラーを表示
+ コントローラーを非表示
すべて切替
見た目を調整
大きさ
diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml
index 3f3a4a96c0..c6d9457744 100644
--- a/src/android/app/src/main/res/values-ko/strings.xml
+++ b/src/android/app/src/main/res/values-ko/strings.xml
@@ -798,6 +798,7 @@
십자키 슬라이드
터치 햅틱
컨트롤러 표시
+ 컨트롤러 숨기기
모두 선택
컨트롤러 조정
크기
diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml
index 1e898fca79..3cc4c6d12c 100644
--- a/src/android/app/src/main/res/values-nb/strings.xml
+++ b/src/android/app/src/main/res/values-nb/strings.xml
@@ -720,7 +720,8 @@
Relativt pinnesenter
D-pad-skyving
Berøringshaptikk
- Vis overlegg
+ Vis kontroller
+ Skjul kontroller
Veksle mellom alle
Juster overlegg
Skaler
diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml
index 724d7608b6..b9858838e8 100644
--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@@ -718,7 +718,8 @@
Wycentruj gałki
Ruchomy D-pad
Wibracje haptyczne
- Pokaż przyciski
+ Pokaż kontroler
+ Ukryj kontroler
Włącz wszystkie
Dostosuj nakładkę
Skala
diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml
index a3fd3fe13a..1296fad889 100644
--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -855,7 +855,8 @@ uma tentativa de mapeamento automático
Centro Relativo do Analógico
Deslizamento dos Botões Direcionais
Vibração ao tocar
- Mostrar overlay
+ Mostrar controle
+ Ocultar controle
Marcar/Desmarcar tudo
Ajustar overlay
Escala
diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml
index 7adce075cf..a166907877 100644
--- a/src/android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml
@@ -855,7 +855,8 @@ uma tentativa de mapeamento automático
Centro Relativo de Analógico
Deslizamento dos Botões Direcionais
Vibração ao tocar
- Mostrar overlay
+ Mostrar comando
+ Ocultar comando
Marcar/Desmarcar tudo
Ajustar overlay
Escala
diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml
index 8d02ff7b58..dc68c7b817 100644
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@@ -856,7 +856,8 @@
Относительный центр стика
Слайд крестовиной
Обратная связь от нажатий
- Показать оверлей
+ Показать контроллер
+ Скрыть контроллер
Переключить всё
Регулировка оверлея
Масштаб
diff --git a/src/android/app/src/main/res/values-sr/strings.xml b/src/android/app/src/main/res/values-sr/strings.xml
index 2294033550..c547b3f761 100644
--- a/src/android/app/src/main/res/values-sr/strings.xml
+++ b/src/android/app/src/main/res/values-sr/strings.xml
@@ -812,7 +812,8 @@
Релативни центар за штапић
Д-Пад Слиде
Додирните ХАптицс
- Приказати прекривање
+ Приказати контролер
+ Сакрити контролер
Пребацивати све
Подесити прекривање
Скала
diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml
index ebb5493f12..b48a8a4a58 100644
--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@@ -749,7 +749,8 @@
Відносний центр джойстика
Ковзання D-pad
Тактильний відгук
- Показати накладання
+ Показати контролер
+ Сховати контролер
Перемкнути все
Налаштувати накладання
Масштаб
diff --git a/src/android/app/src/main/res/values-vi/strings.xml b/src/android/app/src/main/res/values-vi/strings.xml
index 102c720835..b19d437ceb 100644
--- a/src/android/app/src/main/res/values-vi/strings.xml
+++ b/src/android/app/src/main/res/values-vi/strings.xml
@@ -723,7 +723,8 @@
Trung tâm nút cần xoay tương đối
Trượt D-pad
Chạm haptics
- Hiện lớp phủ
+ Hiện bộ điều khiển
+ Ẩn bộ điều khiển
Chuyển đổi tất cả
Điều chỉnh lớp phủ
Tỉ lệ thu phóng
diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml
index a0dab375d0..95ab14abd0 100644
--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -848,7 +848,8 @@
相对摇杆中心
十字方向键滑动
触觉反馈
- 显示虚拟按键
+ 显示控制器
+ 隐藏控制器
全部切换
调整虚拟按键
缩放
diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml
index 851483668a..8640875f2c 100644
--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -853,7 +853,8 @@
相對搖桿中心
方向鍵滑動
觸覺回饋技術
- 顯示覆疊
+ 顯示控制器
+ 隱藏控制器
全部切換
調整覆疊
縮放
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index f73fc1d9aa..7124ba41b4 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -835,7 +835,8 @@
Relative stick center
D-pad slide
Touch haptics
- Show overlay
+ Show controller
+ Hide controller
Toggle all
Adjust overlay
Scale