VERY experimental Nintendo Switch 2 emulator
C++
Merge pull request #11380 from t895/settings-integration
Charles Lombardo483a39e4fbc8
diff --cc src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 956c35c0a8,70df3af802..53f19c4f84--- 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@@@ -46,9 -47,7 +48,8 @@@ import org.yuzu.yuzu_emu.databinding.Diimport org.yuzu.yuzu_emu.databinding.FragmentEmulationBindingimport org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.features.settings.model.Settings- import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFile+import org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.overlay.InputOverlayimport org.yuzu.yuzu_emu.utils.*diff --cc src/android/app/src/main/res/navigation/emulation_navigation.xmlindex cd1d36a12a,2a3c23d554..c7be37f9b2--- a/src/android/app/src/main/res/navigation/emulation_navigation.xml+++ b/src/android/app/src/main/res/navigation/emulation_navigation.xml@@@ -12,9 -12,24 +12,26 @@@tools:layout="@layout/fragment_emulation" ><argumentandroid:name="game"- app:argType="org.yuzu.yuzu_emu.model.Game" />+ app:argType="org.yuzu.yuzu_emu.model.Game"+ app:nullable="true"+ android:defaultValue="@null" /></fragment>+ <activity+ android:id="@+id/settingsActivity"+ android:name="org.yuzu.yuzu_emu.features.settings.ui.SettingsActivity"+ android:label="SettingsActivity">+ <argument+ android:name="game"+ app:argType="org.yuzu.yuzu_emu.model.Game"+ app:nullable="true" />+ <argument+ android:name="menuTag"+ app:argType="string" />+ </activity>++ <action+ android:id="@+id/action_global_settingsActivity"+ app:destination="@id/settingsActivity" />+</navigation>