diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-26 05:30:35 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-26 05:30:35 -0600 |
| commit | 7df55d220f8cd699f47a3b51ebc808554f6fbd7a (patch) | |
| tree | 9a46d9f442c1961afe77d4c934f4ff9bf57c97fc /Source/Android/src | |
| parent | 53a9df10f9d7a53bce947a0fdc43e6d3c482bf86 (diff) | |
| parent | de070cfe8bd90a838be452b8a6a45363fad94525 (diff) | |
Merge pull request #1967 from Sonicadvance1/Android_settings
[Android] Change some configuration options.
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java | 1 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java b/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java index 779feee707..83960433ec 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/AssetCopyService.java @@ -45,7 +45,6 @@ public final class AssetCopyService extends IntentService if(!file.exists()) { NativeLibrary.CreateUserFolders(); - copyAsset("Dolphin.ini", ConfigDir + File.separator + "Dolphin.ini"); copyAsset("dsp_coef.bin", GCDir + File.separator + "dsp_coef.bin"); copyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); copyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index 1cfeb5cbae..e06c6d07f2 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -10,6 +10,7 @@ import org.dolphinemu.dolphinemu.NativeLibrary; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import android.preference.PreferenceManager; /** @@ -39,11 +40,15 @@ public final class UserPreferences SharedPreferences.Editor editor = prefs.edit(); // Add the settings. - editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); + if (Build.CPU_ABI.contains("arm64")) + editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "4")); + else + editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); + editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True")); editor.putBoolean("fastmemPref", getConfig("Dolphin.ini", "Core", "Fastmem", "False").equals("True")); - editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer")); + editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL")); editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True")); editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True")); |