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: Fix controller 1 default type of "Not Set"

Browse source
This commit is contained in:
Connor McLaughlin 2021-03-20 02:24:57 +10:00
parent ab02fbdfad
commit 7e4453a7d4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/app/src/main/java/com/github/stenzek/duckstation/ControllerSettingsActivity.java
View file

@ -216,7 +216,7 @@ public class ControllerSettingsActivity extends AppCompatActivity {
private void createPreferences() { private void createPreferences() {
final PreferenceScreen ps = getPreferenceScreen(); final PreferenceScreen ps = getPreferenceScreen();
final SharedPreferences sp = getPreferenceManager().getSharedPreferences(); final SharedPreferences sp = getPreferenceManager().getSharedPreferences();
final String defaultControllerType = controllerIndex == 0 ? "DigitalController" : "None"; final String defaultControllerType = (controllerIndex == 1) ? "DigitalController" : "None";
final String controllerTypeKey = String.format("Controller%d/Type", controllerIndex); final String controllerTypeKey = String.format("Controller%d/Type", controllerIndex);
final String controllerType = sp.getString(controllerTypeKey, defaultControllerType); final String controllerType = sp.getString(controllerTypeKey, defaultControllerType);
final String[] controllerButtons = AndroidHostInterface.getControllerButtonNames(controllerType); final String[] controllerButtons = AndroidHostInterface.getControllerButtonNames(controllerType);
@ -227,6 +227,7 @@ public class ControllerSettingsActivity extends AppCompatActivity {
typePreference.setEntries(R.array.settings_controller_type_entries); typePreference.setEntries(R.array.settings_controller_type_entries);
typePreference.setEntryValues(R.array.settings_controller_type_values); typePreference.setEntryValues(R.array.settings_controller_type_values);
typePreference.setKey(controllerTypeKey); typePreference.setKey(controllerTypeKey);
typePreference.setValue(controllerType);
typePreference.setTitle(R.string.settings_controller_type); typePreference.setTitle(R.string.settings_controller_type);
typePreference.setSummaryProvider(ListPreference.SimpleSummaryProvider.getInstance()); typePreference.setSummaryProvider(ListPreference.SimpleSummaryProvider.getInstance());
typePreference.setIconSpaceReserved(false); typePreference.setIconSpaceReserved(false);