From 96e7f774ae8fccc94a9ebda7d090b1a251e41fd4 Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Mon, 25 Jan 2016 08:47:08 -0500
Subject: [PATCH 1/2] Fix rotations in Settings screen breaking everything

---
 .../dolphinemu/dolphinemu/ui/settings/SettingsActivity.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
index c84c145f6e..70d3cfbb86 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
@@ -21,7 +21,6 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
 {
 	private SettingsActivityPresenter mPresenter = new SettingsActivityPresenter(this);
 
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
@@ -53,6 +52,8 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
 	@Override
 	protected void onSaveInstanceState(Bundle outState)
 	{
+		// Critical: If super method is not called, rotations will be busted.
+		super.onSaveInstanceState(outState);
 		mPresenter.saveState(outState);
 	}
 

From 28bcd2636b39eee57fd77152b575069a91e7b6b7 Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Mon, 25 Jan 2016 08:58:20 -0500
Subject: [PATCH 2/2] Fix CPU Core selection on x86-64 devices (really, just
 the Android emulator)

---
 .../Android/app/src/arm/res/values/arrays.xml | 16 --------
 .../app/src/arm/res/values/strings.xml        |  5 ---
 .../app/src/main/res/values/arrays.xml        | 41 -------------------
 .../app/src/x86_64/res/values/arrays.xml      |  4 +-
 .../app/src/x86_64/res/values/strings.xml     |  5 ---
 5 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 Source/Android/app/src/arm/res/values/arrays.xml
 delete mode 100644 Source/Android/app/src/arm/res/values/strings.xml
 delete mode 100644 Source/Android/app/src/x86_64/res/values/strings.xml

diff --git a/Source/Android/app/src/arm/res/values/arrays.xml b/Source/Android/app/src/arm/res/values/arrays.xml
deleted file mode 100644
index a98f723b24..0000000000
--- a/Source/Android/app/src/arm/res/values/arrays.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/Source/Android/app/src/arm/res/values/strings.xml b/Source/Android/app/src/arm/res/values/strings.xml
deleted file mode 100644
index ec82295355..0000000000
--- a/Source/Android/app/src/arm/res/values/strings.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index c7299780c6..bf2afc4527 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -2,47 +2,6 @@
 
 <!-- All lists for ListPreference keys/values are placed here -->
 <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 -->
     <string-array name="string_emu_cores" translatable="false">
         <item>@string/interpreter</item>
diff --git a/Source/Android/app/src/x86_64/res/values/arrays.xml b/Source/Android/app/src/x86_64/res/values/arrays.xml
index a6eeff8c60..d4c65b9b63 100644
--- a/Source/Android/app/src/x86_64/res/values/arrays.xml
+++ b/Source/Android/app/src/x86_64/res/values/arrays.xml
@@ -9,10 +9,10 @@
         <item>@string/jit64_recompiler</item>
         <item>@string/jitil_recompiler</item>
     </string-array>
-    <string-array name="int_emu_cores" translatable="false">
+    <integer-array name="int_emu_cores" translatable="false">
         <item>0</item>
         <item>1</item>
         <item>2</item>
-    </string-array>
+    </integer-array>
 
 </resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/x86_64/res/values/strings.xml b/Source/Android/app/src/x86_64/res/values/strings.xml
deleted file mode 100644
index ec82295355..0000000000
--- a/Source/Android/app/src/x86_64/res/values/strings.xml
+++ /dev/null
@@ -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>
\ No newline at end of file