ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3568 from sigmabeta/android-settings-more-fixes 

[Android] More settings fixes
This commit is contained in:
Mathew Maidment 2016-01-25 11:50:58 -05:00
parent bdfcaa0e00 28bcd2636b
commit 9199539798
6 changed files with 4 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Android/app/src/arm/res/values/arrays.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- All lists for ListPreference keys/values are placed here -->
<resources>
<!-- New UI CPU Core selection - ARM32 -->
<string-array name="string_emu_cores" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit_arm_recompiler</item>
</string-array>
<string-array name="int_emu_cores" translatable="false">
<item>0</item>
<item>3</item>
</string-array>
</resources>

5
Source/Android/app/src/arm/res/values/strings.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Title of the app -->
<string name="title_new_ui">Dolphin ARM32</string>
</resources>

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
View File

@ -21,7 +21,6 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
{ {
private SettingsActivityPresenter mPresenter = new SettingsActivityPresenter(this); private SettingsActivityPresenter mPresenter = new SettingsActivityPresenter(this);
@Override @Override
protected void onCreate(Bundle savedInstanceState) protected void onCreate(Bundle savedInstanceState)
{ {
@ -53,6 +52,8 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
@Override @Override
protected void onSaveInstanceState(Bundle outState) protected void onSaveInstanceState(Bundle outState)
{ {
// Critical: If super method is not called, rotations will be busted.
super.onSaveInstanceState(outState);
mPresenter.saveState(outState); mPresenter.saveState(outState);
} }

41
Source/Android/app/src/main/res/values/arrays.xml
View File

@ -2,47 +2,6 @@
<!-- All lists for ListPreference keys/values are placed here --> <!-- All lists for ListPreference keys/values are placed here -->
<resources> <resources>
<!-- CPU core selection - X86_64 -->
<string-array name="emuCoreEntriesX86_64" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit64_recompiler</item>
<item>@string/jitil_recompiler</item>
</string-array>
<integer-array name="emuCoreValuesX86_64" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</integer-array>
<!-- CPU core selection - ARM -->
<string-array name="emuCoreEntriesARM" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit_arm_recompiler</item>
</string-array>
<integer-array name="emuCoreValuesARM" translatable="false">
<item>0</item>
<item>3</item>
</integer-array>
<!-- CPU core selection - ARM64 -->
<string-array name="emuCoreEntriesARM64" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit_arm64_recompiler</item>
</string-array>
<integer-array name="emuCoreValuesARM64" translatable="false">
<item>0</item>
<item>4</item>
</integer-array>
<!-- CPU core selection - Other -->
<string-array name="emuCoreEntriesOther" translatable="false">
<item>@string/interpreter</item>
</string-array>
<integer-array name="emuCoreValuesOther" translatable="false">
<item>0</item>
</integer-array>
<!-- New UI CPU Core selection - Default --> <!-- New UI CPU Core selection - Default -->
<string-array name="string_emu_cores" translatable="false"> <string-array name="string_emu_cores" translatable="false">
<item>@string/interpreter</item> <item>@string/interpreter</item>

4
Source/Android/app/src/x86_64/res/values/arrays.xml
View File

@ -9,10 +9,10 @@
<item>@string/jit64_recompiler</item> <item>@string/jit64_recompiler</item>
<item>@string/jitil_recompiler</item> <item>@string/jitil_recompiler</item>
</string-array> </string-array>
<string-array name="int_emu_cores" translatable="false"> <integer-array name="int_emu_cores" translatable="false">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
</string-array> </integer-array>
</resources> </resources>

5
Source/Android/app/src/x86_64/res/values/strings.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Title of the app -->
<string name="title_new_ui">Dolphin ARM32</string>
</resources>