From 11c8854301be7f3f7723c7cae70c07c3e6a31204 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Sun, 19 Jan 2014 20:51:53 -0500
Subject: [PATCH] Add input menu to Android 2.3 and re-order to match 3.0+

---
 .../res/layout/mainuilayout_fragment.xml      | 33 ++++++++-----
 .../com/reicast/emulator/MainActivity.java    | 47 +++++++++----------
 2 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/shell/android/res/layout/mainuilayout_fragment.xml b/shell/android/res/layout/mainuilayout_fragment.xml
index 260adb22a..8bc9c2a5a 100644
--- a/shell/android/res/layout/mainuilayout_fragment.xml
+++ b/shell/android/res/layout/mainuilayout_fragment.xml
@@ -28,17 +28,6 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textSize="32dp" />
 
-        <ImageView
-            android:id="@+id/options"
-            android:layout_width="48dp"
-            android:layout_height="fill_parent"
-            android:layout_marginBottom="2dp"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_marginTop="2dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/open_folder" />
-
         <ImageView
             android:id="@+id/config"
             android:layout_width="48dp"
@@ -59,6 +48,28 @@
             android:layout_marginTop="2dp"
             android:scaleType="fitCenter"
             android:src="@drawable/question" />
+        
+        <ImageView
+            android:id="@+id/options"
+            android:layout_width="48dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="2dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_marginTop="2dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/open_folder" />
+        
+        <ImageView
+            android:id="@+id/input"
+            android:layout_width="48dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="2dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginRight="2dp"
+            android:layout_marginTop="2dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/input" />
     </LinearLayout>
 
     <FrameLayout
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 38d0b1417..3525047a4 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -169,6 +169,25 @@ public class MainActivity extends FragmentActivity implements
 			}
 		} else {
 
+			findViewById(R.id.config).setOnClickListener(new OnClickListener() {
+				public void onClick(View view) {
+					ConfigureFragment configFrag = (ConfigureFragment) getSupportFragmentManager()
+							.findFragmentByTag("CONFIG_FRAG");
+					if (configFrag != null) {
+						if (configFrag.isVisible()) {
+							return;
+						}
+					}
+					configFrag = new ConfigureFragment();
+					getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, configFrag,
+									"CONFIG_FRAG").addToBackStack(null)
+							.commit();
+				}
+
+			});
+			
 			findViewById(R.id.options).setOnClickListener(
 					new OnClickListener() {
 						public void onClick(View view) {
@@ -185,34 +204,14 @@ public class MainActivity extends FragmentActivity implements
 									.replace(R.id.fragment_container,
 											optionsFrag, "OPTIONS_FRAG")
 									.addToBackStack(null).commit();
-							/*
-							 * AlertDialog.Builder alertDialogBuilder = new
-							 * AlertDialog.Builder( MainActivity.this);
-							 * 
-							 * // set title
-							 * alertDialogBuilder.setTitle("Configure");
-							 * 
-							 * // set dialog message alertDialogBuilder
-							 * .setMessage("No configuration for now :D")
-							 * .setCancelable(false)
-							 * .setPositiveButton("Oh well",new
-							 * DialogInterface.OnClickListener() { public void
-							 * onClick(DialogInterface dialog,int id) {
-							 * //FileBrowser.this.finish(); } });
-							 * 
-							 * // create alert dialog AlertDialog alertDialog =
-							 * alertDialogBuilder.create();
-							 * 
-							 * // show it alertDialog.show();
-							 */
 						}
 
 					});
-
-			findViewById(R.id.config).setOnClickListener(new OnClickListener() {
+			
+			findViewById(R.id.input).setOnClickListener(new OnClickListener() {
 				public void onClick(View view) {
 					ConfigureFragment configFrag = (ConfigureFragment) getSupportFragmentManager()
-							.findFragmentByTag("CONFIG_FRAG");
+							.findFragmentByTag("INPUT_FRAG");
 					if (configFrag != null) {
 						if (configFrag.isVisible()) {
 							return;
@@ -222,7 +221,7 @@ public class MainActivity extends FragmentActivity implements
 					getSupportFragmentManager()
 							.beginTransaction()
 							.replace(R.id.fragment_container, configFrag,
-									"CONFIG_FRAG").addToBackStack(null)
+									"INPUT_FRAG").addToBackStack(null)
 							.commit();
 				}