Android: Support more than one controller

This commit is contained in:
Connor McLaughlin
2021-03-14 17:21:39 +10:00
parent 1839bfab3b
commit c8a029c5cb
15 changed files with 234 additions and 143 deletions

View File

@ -138,12 +138,18 @@
<item>xBRBinAlpha</item>
</string-array>
<string-array name="settings_controller_type_entries">
<item>None</item>
<item>Digital Controller (Gamepad)</item>
<item>Analog Controller (DualShock)</item>
<item>Analog Joystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_controller_type_values">
<item>None</item>
<item>DigitalController</item>
<item>AnalogController</item>
<item>AnalogJoystick</item>
<item>NeGcon</item>
</string-array>
<string-array name="settings_memory_card_mode_entries">
<item>No Memory Card</item>
@ -265,7 +271,6 @@
<item>Display</item>
<item>Audio</item>
<item>Enhancements</item>
<item>Controllers</item>
<item>Achievements</item>
<item>Advanced</item>
</string-array>

View File

@ -1,7 +1,7 @@
<resources>
<string name="app_name">DuckStation</string>
<string name="action_settings">Settings</string>
<string name="action_controller_mapping">Controller Mapping</string>
<string name="action_controller_mapping">Controller Settings</string>
<string name="title_activity_settings">Settings</string>
<string name="settings_console_region">Console Region</string>
<string name="settings_console_tty_output">Enable TTY Output</string>
@ -167,7 +167,7 @@
<string name="controller_binding_dialog_no_binding"><![CDATA[<No Binding>]]></string>
<string name="controller_binding_dialog_cancel">Cancel</string>
<string name="controller_binding_dialog_clear">Clear</string>
<string name="controller_mapping_activity_title">Controller Mapping</string>
<string name="controller_mapping_activity_title">Controller Settings</string>
<string name="controller_mapping_activity_no_profiles_found">No profiles found.</string>
<string name="controller_mapping_activity_select_input_profile">Select Input Profile</string>
<string name="controller_mapping_activity_failed_to_load_profile">Failed to load profile \'%s\'</string>
@ -267,4 +267,11 @@
<string name="settings_achievements_confirm_logout_title">Confirm Logout</string>
<string name="settings_achievements_confirm_logout_message">After logging out, no more achievements will be unlocked until you log back in again. Achievements already unlocked will not be lost.</string>
<string name="controller_binding_device_for_vibration">Device for Vibration</string>
<string name="controller_settings_tab_settings">Settings</string>
<string name="controller_settings_tab_hotkeys">Hotkeys</string>
<string name="controller_settings_category_button_bindings">Button Bindings</string>
<string name="controller_settings_category_axis_bindings">Axis Bindings</string>
<string name="controller_settings_category_settings">Settings</string>
<string name="controller_settings_category_touchscreen_controller">Touchscreen Controller</string>
<string name="controller_settings_category_memory_cards">Memory Cards</string>
</resources>