history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-28 17:55:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Expose more settings via UI

Browse Source
This commit is contained in:
Connor McLaughlin 2020-07-31 03:40:27 +10:00
parent fb85e2b441
commit 73c9a31b86
2 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
android/app/src/main/res/values/arrays.xml
View File

@ -67,6 +67,32 @@
<item>15</item> <item>15</item>
<item>16</item> <item>16</item>
</string-array> </string-array>
<string-array name="settings_display_crop_mode_entries">
<item>None</item>
<item>Overscan</item>
<item>Borders</item>
</string-array>
<string-array name="settings_display_crop_mode_values">
<item>None</item>
<item>Only Overscan Area</item>
<item>All Borders</item>
</string-array>
<string-array name="settings_display_aspect_ratio_names">
<item>4:3</item>
<item>16:9</item>
<item>8:7</item>
<item>2:1 (VRAM 1:1)</item>
<item>1:1</item>
<item>PAR 1:1</item>
</string-array>
<string-array name="settings_display_aspect_ratio_values">
<item>4:3</item>
<item>16:9</item>
<item>8:7</item>
<item>2:1 (VRAM 1:1)</item>
<item>1:1</item>
<item>PAR 1:1</item>
</string-array>
<string-array name="settings_controller_type_entries"> <string-array name="settings_controller_type_entries">
<item>Digital Controller (Gamepad)</item> <item>Digital Controller (Gamepad)</item>
<item>Analog Controller (DualShock)</item> <item>Analog Controller (DualShock)</item>

42
android/app/src/main/res/xml/root_preferences.xml
View File

@ -57,24 +57,19 @@
<PreferenceCategory app:title="@string/settings_behavior_header"> <PreferenceCategory app:title="@string/settings_behavior_header">
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="General/SpeedLimiterEnabled" app:key="Main/SpeedLimiterEnabled"
app:title="@string/settings_behavior_enable_speed_limiter" app:title="@string/settings_behavior_enable_speed_limiter"
app:defaultValue="true" app:defaultValue="true"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="General/StartPaused" app:key="Main/StartPaused"
app:title="@string/settings_behavior_pause_on_start" app:title="@string/settings_behavior_pause_on_start"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="General/SyncToAudio" app:key="Audio/Sync"
app:title="@string/settings_host_synchronization_sync_to_audio" app:title="@string/settings_host_synchronization_sync_to_audio"
app:defaultValue="true" app:defaultValue="true"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
app:key="General/SyncToVideo"
app:title="@string/settings_host_synchronization_sync_to_video"
app:defaultValue="true"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_osd_header"> <PreferenceCategory app:title="@string/settings_osd_header">
@ -132,11 +127,40 @@
app:title="@string/settings_gpu_true_color" app:title="@string/settings_gpu_true_color"
app:defaultValue="false"/> app:defaultValue="false"/>
</PreferenceCategory>
<PreferenceCategory app:title="Display">
<ListPreference
app:key="Display/CropMode"
app:title="Crop Mode"
app:entries="@array/settings_display_crop_mode_entries"
app:entryValues="@array/settings_display_crop_mode_values"
app:defaultValue="Overscan"
app:useSimpleSummaryProvider="true" />
<ListPreference
app:key="Display/AspectRatio"
app:title="Aspect Ratio"
app:entries="@array/settings_display_aspect_ratio_names"
app:entryValues="@array/settings_display_aspect_ratio_values"
app:defaultValue="4:3"
app:useSimpleSummaryProvider="true" />]
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="Display/LinearFiltering" app:key="Display/LinearFiltering"
app:title="@string/settings_gpu_display_linear_filtering" app:title="Linear Upscaling"
app:defaultValue="true"/> app:defaultValue="true"/>
<SwitchPreferenceCompat
app:key="Display/IntegerScaling"
app:title="Integer Upscaling"
app:defaultValue="false"/>
<SwitchPreferenceCompat
app:key="Display/VSync"
app:title="VSync"
app:defaultValue="true"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="Controller"> <PreferenceCategory app:title="Controller">