Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Move a bunch of settings to advanced

Browse source
This commit is contained in:
Connor McLaughlin 2021-02-27 14:23:37 +10:00
parent 5a0e4f85dd
commit e53ec0cc73
5 changed files with 240 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/app/src/main/res/values/strings.xml
View file

@ -214,4 +214,11 @@
<string name="settings_summary_osd_show_resolution">Shows the resolution the game is rendering at in the top-right corner of the display.</string> <string name="settings_summary_osd_show_resolution">Shows the resolution the game is rendering at in the top-right corner of the display.</string>
<string name="settings_summary_display_stretch">Stretches the active display to fill the screen.</string> <string name="settings_summary_display_stretch">Stretches the active display to fill the screen.</string>
<string name="settings_display_stretch">Stretch To Fill</string> <string name="settings_display_stretch">Stretch To Fill</string>
<string name="settings_category_global">Global Settings</string>
<string name="settings_category_display">Display Settings</string>
<string name="settings_category_audio">Audio Settings</string>
<string name="settings_category_console">Console Settings</string>
<string name="settings_category_cpu">CPU Settings</string>
<string name="settings_category_gpu">GPU Settings</string>
<string name="settings_category_logging">Logging Settings</string>
</resources> </resources>

319
android/app/src/main/res/xml/advanced_preferences.xml
View file

@ -15,123 +15,206 @@
--> -->
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"> <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<ListPreference <PreferenceCategory app:title="@string/settings_category_global" app:iconSpaceReserved="false">
app:key="Main/Language" <SwitchPreferenceCompat
app:title="@string/settings_language" app:key="Main/AutoLoadCheats"
app:defaultValue="none" app:title="@string/settings_load_patch_codes"
app:entries="@array/settings_language_entries" app:defaultValue="true"
app:entryValues="@array/settings_language_values" app:summary="@string/settings_summary_load_patch_codes"
app:useSimpleSummaryProvider="true" app:iconSpaceReserved="false" />
app:iconSpaceReserved="false" /> <SwitchPreferenceCompat
<SwitchPreferenceCompat app:key="Main/ApplyGameSettings"
app:key="Main/DisableAllEnhancements" app:title="@string/settings_apply_compatibility_settings"
app:title="@string/settings_disable_all_enhancements" app:defaultValue="true"
app:defaultValue="false" app:summary="@string/settings_summary_apply_compatibility_settings"
app:summary="@string/settings_summary_disable_all_enhancements" app:iconSpaceReserved="false" />
app:iconSpaceReserved="false" /> <SwitchPreferenceCompat
<SwitchPreferenceCompat app:key="Main/DisableAllEnhancements"
app:key="Main/SustainedPerformanceMode" app:title="@string/settings_disable_all_enhancements"
app:title="@string/settings_sustained_performance_mode" app:defaultValue="false"
app:defaultValue="false" app:summary="@string/settings_summary_disable_all_enhancements"
app:summary="@string/settings_summary_sustained_performance_mode" app:iconSpaceReserved="false" />
app:iconSpaceReserved="false" /> <SwitchPreferenceCompat
<ListPreference app:key="Main/SustainedPerformanceMode"
app:key="CPU/Overclock" app:title="@string/settings_sustained_performance_mode"
app:title="@string/settings_cpu_overclocking" app:defaultValue="false"
app:defaultValue="100" app:summary="@string/settings_summary_sustained_performance_mode"
app:entries="@array/settings_advanced_cpu_overclock_entries" app:iconSpaceReserved="false" />
app:entryValues="@array/settings_advanced_cpu_overclock_values" </PreferenceCategory>
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" /> <PreferenceCategory app:title="@string/settings_category_display" app:iconSpaceReserved="false">
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="CDROM/RegionCheck" app:key="Display/VSync"
app:title="@string/settings_cdrom_region_check" app:title="@string/settings_video_sync"
app:defaultValue="false" app:defaultValue="false"
app:summary="@string/settings_summary_cdrom_region_check" app:summary="@string/settings_summary_video_sync"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="CDROM/LoadImageToRAM" app:key="Main/SyncToHostRefreshRate"
app:title="@string/settings_cdrom_preload_image_to_ram" app:title="@string/settings_general_sync_to_host_refresh_rate"
app:defaultValue="false" app:defaultValue="false"
app:summary="@string/settings_summary_preload_image_to_ram" app:summary="@string/settings_summary_general_sync_to_host_refresh_rate"
app:iconSpaceReserved="false" /> app:dependency="Display/VSync"
<SwitchPreferenceCompat app:iconSpaceReserved="false" />
app:key="GPU/UseThread" <SwitchPreferenceCompat
app:title="@string/settings_gpu_thread" app:key="Display/DisplayAllFrames"
app:defaultValue="true" app:title="@string/settings_display_all_frames"
app:summary="@string/settings_summary_gpu_thread" app:defaultValue="false"
app:iconSpaceReserved="false" /> app:summary="@string/settings_summary_display_all_frames"
<SwitchPreferenceCompat app:iconSpaceReserved="false" />
app:key="GPU/ThreadedPresentation" <ListPreference
app:title="@string/settings_gpu_threaded_presentation" app:key="Display/MaxFPS"
app:defaultValue="true" app:title="@string/settings_presented_frame_limit"
app:summary="@string/settings_summary_gpu_threaded_presentation" app:defaultValue="60"
app:iconSpaceReserved="false" /> app:entries="@array/settings_advanced_display_fps_limit_entries"
<SwitchPreferenceCompat app:entryValues="@array/settings_advanced_display_fps_limit_values"
app:key="GPU/PGXPVertexCache" app:useSimpleSummaryProvider="true"
app:title="@string/settings_pgxp_vertex_cache" app:iconSpaceReserved="false" />
app:defaultValue="false" </PreferenceCategory>
app:summary="@string/settings_summary_pgxp_vertex_cache"
app:iconSpaceReserved="false" /> <PreferenceCategory app:title="@string/settings_category_audio" app:iconSpaceReserved="false">
<SwitchPreferenceCompat <ListPreference
app:key="GPU/PGXPCPU" app:key="Audio/Backend"
app:title="@string/settings_pgxp_cpu_mode" app:title="@string/settings_audio_backend"
app:defaultValue="false" app:entries="@array/settings_audio_backend_entries"
app:summary="@string/settings_summary_pgxp_cpu_mode" app:entryValues="@array/settings_audio_backend_values"
app:iconSpaceReserved="false" /> app:defaultValue="OpenSLES"
<SwitchPreferenceCompat app:useSimpleSummaryProvider="true"
app:key="CPU/RecompilerICache" app:iconSpaceReserved="false" />
app:title="@string/settings_cpu_recompiler_icache" <ListPreference
app:defaultValue="false" app:key="Audio/BufferSize"
app:summary="@string/settings_summary_cpu_recompiler_icache" app:title="@string/settings_audio_buffer_size"
app:iconSpaceReserved="false" /> app:entries="@array/settings_audio_buffer_size_entries"
<ListPreference app:entryValues="@array/settings_audio_buffer_size_values"
app:key="CPU/FastmemMode" app:defaultValue="2048"
app:title="@string/settings_cpu_recompiler_fastmem" app:summary="@string/settings_summary_audio_buffer_size"
app:entries="@array/settings_cpu_fastmem_mode_entries" app:useSimpleSummaryProvider="true"
app:entryValues="@array/settings_cpu_fastmem_mode_values" app:iconSpaceReserved="false" />
app:useSimpleSummaryProvider="true" <SwitchPreferenceCompat
app:defaultValue="MMap" app:key="Audio/Sync"
app:summary="@string/settings_summary_cpu_recompiler_fastmem" app:title="@string/settings_audio_sync"
app:iconSpaceReserved="false" /> app:defaultValue="true"
<SwitchPreferenceCompat app:summary="@string/settings_summary_audio_sync"
app:key="Display/DisplayAllFrames" app:iconSpaceReserved="false" />
app:title="@string/settings_display_all_frames" <SwitchPreferenceCompat
app:defaultValue="false" app:key="Audio/Resampling"
app:summary="@string/settings_summary_display_all_frames" app:title="@string/settings_audio_resampling"
app:iconSpaceReserved="false" /> app:defaultValue="true"
<ListPreference app:summary="@string/settings_summary_audio_resampling"
app:key="Display/MaxFPS" app:iconSpaceReserved="false" />
app:title="@string/settings_presented_frame_limit" </PreferenceCategory>
app:defaultValue="60"
app:entries="@array/settings_advanced_display_fps_limit_entries" <PreferenceCategory app:title="@string/settings_category_console" app:iconSpaceReserved="false">
app:entryValues="@array/settings_advanced_display_fps_limit_values" <ListPreference
app:useSimpleSummaryProvider="true" app:key="Console/Region"
app:iconSpaceReserved="false" /> app:title="@string/settings_console_region"
<SwitchPreferenceCompat app:entries="@array/settings_console_region_entries"
app:key="BIOS/PatchTTYEnable" app:entryValues="@array/settings_console_region_values"
app:title="@string/settings_console_tty_output" app:defaultValue="Auto"
app:defaultValue="false" app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference <SwitchPreferenceCompat
app:key="Logging/LogLevel" app:key="CDROM/RegionCheck"
app:title="@string/settings_logging_level" app:title="@string/settings_cdrom_region_check"
app:defaultValue="Warning" app:defaultValue="false"
app:entries="@array/settings_log_level_entries" app:summary="@string/settings_summary_cdrom_region_check"
app:entryValues="@array/settings_log_level_values" app:iconSpaceReserved="false" />
app:useSimpleSummaryProvider="true" <SwitchPreferenceCompat
app:iconSpaceReserved="false" /> app:key="CDROM/LoadImageToRAM"
<SwitchPreferenceCompat app:title="@string/settings_cdrom_preload_image_to_ram"
app:key="Logging/LogToFile" app:defaultValue="false"
app:title="@string/settings_log_to_file" app:summary="@string/settings_summary_preload_image_to_ram"
app:defaultValue="false" app:iconSpaceReserved="false" />
app:summary="@string/settings_summary_log_to_file" </PreferenceCategory>
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat <PreferenceCategory app:title="@string/settings_category_cpu" app:iconSpaceReserved="false">
app:key="Logging/LogToDebug" <ListPreference
app:title="@string/settings_log_to_logcat" app:key="CPU/ExecutionMode"
app:defaultValue="false" app:title="@string/settings_cpu_execution_mode"
app:summary="@string/settings_summary_log_to_logcat" app:entries="@array/settings_cpu_execution_mode_entries"
app:iconSpaceReserved="false" /> app:entryValues="@array/settings_cpu_execution_mode_values"
app:defaultValue="Recompiler"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="CPU/Overclock"
app:title="@string/settings_cpu_overclocking"
app:defaultValue="100"
app:entries="@array/settings_advanced_cpu_overclock_entries"
app:entryValues="@array/settings_advanced_cpu_overclock_values"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="CPU/RecompilerICache"
app:title="@string/settings_cpu_recompiler_icache"
app:defaultValue="false"
app:summary="@string/settings_summary_cpu_recompiler_icache"
app:iconSpaceReserved="false" />
<ListPreference
app:key="CPU/FastmemMode"
app:title="@string/settings_cpu_recompiler_fastmem"
app:entries="@array/settings_cpu_fastmem_mode_entries"
app:entryValues="@array/settings_cpu_fastmem_mode_values"
app:useSimpleSummaryProvider="true"
app:defaultValue="MMap"
app:summary="@string/settings_summary_cpu_recompiler_fastmem"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory app:title="@string/settings_category_gpu" app:iconSpaceReserved="false">
<SwitchPreferenceCompat
app:key="GPU/UseThread"
app:title="@string/settings_gpu_thread"
app:defaultValue="true"
app:summary="@string/settings_summary_gpu_thread"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="GPU/ThreadedPresentation"
app:title="@string/settings_gpu_threaded_presentation"
app:defaultValue="true"
app:summary="@string/settings_summary_gpu_threaded_presentation"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="GPU/PGXPVertexCache"
app:title="@string/settings_pgxp_vertex_cache"
app:defaultValue="false"
app:summary="@string/settings_summary_pgxp_vertex_cache"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="GPU/PGXPCPU"
app:title="@string/settings_pgxp_cpu_mode"
app:defaultValue="false"
app:summary="@string/settings_summary_pgxp_cpu_mode"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory app:title="@string/settings_category_logging" app:iconSpaceReserved="false">
<ListPreference
app:key="Logging/LogLevel"
app:title="@string/settings_logging_level"
app:defaultValue="Warning"
app:entries="@array/settings_log_level_entries"
app:entryValues="@array/settings_log_level_values"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Logging/LogToFile"
app:title="@string/settings_log_to_file"
app:defaultValue="false"
app:summary="@string/settings_summary_log_to_file"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Logging/LogToDebug"
app:title="@string/settings_log_to_logcat"
app:defaultValue="false"
app:summary="@string/settings_summary_log_to_logcat"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="BIOS/PatchTTYEnable"
app:title="@string/settings_console_tty_output"
app:defaultValue="false"
app:summary="Logs debug messages printed by games."
app:iconSpaceReserved="false" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

29
android/app/src/main/res/xml/audio_preferences.xml
View file

@ -47,34 +47,5 @@
app:defaultValue="false" app:defaultValue="false"
app:summary="@string/settings_summary_mute_cd_audio" app:summary="@string/settings_summary_mute_cd_audio"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference
app:key="Audio/Backend"
app:title="@string/settings_audio_backend"
app:entries="@array/settings_audio_backend_entries"
app:entryValues="@array/settings_audio_backend_values"
app:defaultValue="OpenSLES"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="Audio/BufferSize"
app:title="@string/settings_audio_buffer_size"
app:entries="@array/settings_audio_buffer_size_entries"
app:entryValues="@array/settings_audio_buffer_size_values"
app:defaultValue="2048"
app:summary="@string/settings_summary_audio_buffer_size"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Audio/Sync"
app:title="@string/settings_audio_sync"
app:defaultValue="true"
app:summary="@string/settings_summary_audio_sync"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Audio/Resampling"
app:title="@string/settings_audio_resampling"
app:defaultValue="true"
app:summary="@string/settings_summary_audio_resampling"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>

16
android/app/src/main/res/xml/controllers_preferences.xml
View file

@ -25,6 +25,14 @@
app:defaultValue="DigitalController" app:defaultValue="DigitalController"
app:useSimpleSummaryProvider="true" app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference
app:key="Controller1/TouchscreenControllerView"
app:title="@string/settings_touchscreen_controller_view"
app:entries="@array/settings_touchscreen_controller_view_entries"
app:entryValues="@array/settings_touchscreen_controller_view_values"
app:defaultValue="digital"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<Preference <Preference
app:title="@string/settings_controller_mapping" app:title="@string/settings_controller_mapping"
app:summary="@string/settings_controller_mapping_summary" app:summary="@string/settings_controller_mapping_summary"
@ -46,14 +54,6 @@
app:summary="@string/settings_summary_use_analog_sticks_for_dpad" app:summary="@string/settings_summary_use_analog_sticks_for_dpad"
app:defaultValue="true" app:defaultValue="true"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference
app:key="Controller1/TouchscreenControllerView"
app:title="@string/settings_touchscreen_controller_view"
app:entries="@array/settings_touchscreen_controller_view_entries"
app:entryValues="@array/settings_touchscreen_controller_view_values"
app:defaultValue="digital"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="Controller1/AutoHideTouchscreenController" app:key="Controller1/AutoHideTouchscreenController"
app:title="@string/settings_auto_hide_touchscreen_controller" app:title="@string/settings_auto_hide_touchscreen_controller"

83
android/app/src/main/res/xml/general_preferences.xml
View file

@ -41,6 +41,14 @@
app:defaultValue="0.0" app:defaultValue="0.0"
app:useSimpleSummaryProvider="true" app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference
app:key="Main/EmulationScreenOrientation"
app:title="@string/settings_emulation_screen_orientation"
app:entries="@array/settings_emulation_screen_orientation_entries"
app:entryValues="@array/settings_emulation_screen_orientation_values"
app:defaultValue="unspecified"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="Main/SaveStateOnExit" app:key="Main/SaveStateOnExit"
app:title="@string/settings_save_state_on_exit" app:title="@string/settings_save_state_on_exit"
@ -53,65 +61,6 @@
app:defaultValue="false" app:defaultValue="false"
app:summary="@string/settings_summary_pause_when_menu_opened" app:summary="@string/settings_summary_pause_when_menu_opened"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference
app:key="Main/Theme"
app:title="@string/settings_theme"
app:entries="@array/settings_theme_entries"
app:entryValues="@array/settings_theme_values"
app:defaultValue="follow_system"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="Main/EmulationScreenOrientation"
app:title="@string/settings_emulation_screen_orientation"
app:entries="@array/settings_emulation_screen_orientation_entries"
app:entryValues="@array/settings_emulation_screen_orientation_values"
app:defaultValue="unspecified"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Main/AutoLoadCheats"
app:title="@string/settings_load_patch_codes"
app:defaultValue="true"
app:summary="@string/settings_summary_load_patch_codes"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Main/ApplyGameSettings"
app:title="@string/settings_apply_compatibility_settings"
app:defaultValue="true"
app:summary="@string/settings_summary_apply_compatibility_settings"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Display/VSync"
app:title="@string/settings_video_sync"
app:defaultValue="false"
app:summary="@string/settings_summary_video_sync"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
app:key="Main/SyncToHostRefreshRate"
app:title="@string/settings_general_sync_to_host_refresh_rate"
app:defaultValue="false"
app:summary="@string/settings_summary_general_sync_to_host_refresh_rate"
app:dependency="Display/VSync"
app:iconSpaceReserved="false" />
<ListPreference
app:key="Console/Region"
app:title="@string/settings_console_region"
app:entries="@array/settings_console_region_entries"
app:entryValues="@array/settings_console_region_values"
app:defaultValue="Auto"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="CPU/ExecutionMode"
app:title="@string/settings_cpu_execution_mode"
app:entries="@array/settings_cpu_execution_mode_entries"
app:entryValues="@array/settings_cpu_execution_mode_values"
app:defaultValue="Recompiler"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference <ListPreference
app:key="GPU/Renderer" app:key="GPU/Renderer"
app:title="@string/settings_gpu_renderer" app:title="@string/settings_gpu_renderer"
@ -120,5 +69,21 @@
app:defaultValue="OpenGL" app:defaultValue="OpenGL"
app:useSimpleSummaryProvider="true" app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" /> app:iconSpaceReserved="false" />
<ListPreference
app:key="Main/Language"
app:title="@string/settings_language"
app:defaultValue="none"
app:entries="@array/settings_language_entries"
app:entryValues="@array/settings_language_values"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
<ListPreference
app:key="Main/Theme"
app:title="@string/settings_theme"
app:entries="@array/settings_theme_entries"
app:entryValues="@array/settings_theme_values"
app:defaultValue="follow_system"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>