20 ...oid/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
View file
@@ -215,11 +215,6 @@ static void readFile(final File file, IniFile ini, SettingsActivityView view)
public static void readFile(final String fileName, IniFile ini, SettingsActivityView view)
{
readFile(getSettingsFile(fileName), ini, view);

if (fileName.equals(Settings.FILE_DOLPHIN))
{
addGcPadSettingsIfTheyDontExist(ini);
}
}

/**
@@ -328,19 +323,4 @@ public static File getWiiProfile(String profile)

return new File(wiiConfigPath);
}

private static void addGcPadSettingsIfTheyDontExist(IniFile ini)
{
IniFile.Section coreSection = ini.getOrCreateSection(Settings.SECTION_INI_CORE);

for (int i = 0; i < 4; i++)
{
String key = SettingsFile.KEY_GCPAD_TYPE + i;
if (!coreSection.exists(key))
{
// Set GameCube controller 1 to enabled, all others disabled
coreSection.setInt(key, i == 0 ? 6 : 0);
}
}
}
}
5 Source/Android/app/src/main/res/values/strings.xml
View file
@@ -183,8 +183,6 @@
<string name="load_path">Load Path</string>
<string name="resource_pack_path">Resource Pack Path</string>
<string name="SD_card_path">SD Card Path</string>
<string name="reset_paths">Reset Paths to Default Settings</string>
<string name="reset_paths_confirmation">Are you sure you want to reset Paths to default settings?</string>

<!-- Graphics Settings -->
<string name="graphics_general">General</string>
@@ -418,6 +416,9 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="write_permission_needed">You need to allow write access to external storage for the emulator to work</string>
<string name="load_settings">Loading Settings...</string>
<string name="setting_not_runtime_editable">This setting can\'t be changed while a game is running.</string>
<string name="setting_clear_info">Long press a setting to clear it.</string>
<string name="setting_clear_confirm">Do you want to restore this setting to its default value?</string>
<string name="setting_cleared">Setting cleared</string>
<string name="emulation_change_disc">Change Disc</string>

<string name="external_storage_not_mounted">The external storage needs to be available in order to use Dolphin</string>