From 9f36081a8f84cbef302a210a4c779250133ec5ba Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 25 Oct 2013 16:52:46 -0400
Subject: [PATCH] [Android] Implement a very basic version of the input overlay
 configuration screen.

Still a bit of a mess, but this will get cleaned up during finalizations.
---
 Source/Android/AndroidManifest.xml            |   2 +
 Source/Android/res/drawable/button_a.png      | Bin 0 -> 5178 bytes
 Source/Android/res/drawable/button_b.png      | Bin 0 -> 4971 bytes
 Source/Android/res/drawable/button_start.png  | Bin 0 -> 1511 bytes
 Source/Android/res/layout/emulation_view.xml  |   8 +
 .../layout/input_overlay_config_layout.xml    |  32 ++++
 Source/Android/res/xml/input_prefs.xml        | 164 +++++++++---------
 .../dolphinemu/dolphinemu/AboutFragment.java  |   2 +-
 .../emulation/EmulationActivity.java          |   4 +-
 .../emulation/overlay/InputOverlay.java       |  64 +++++++
 .../emulation/overlay/InputOverlayItem.java   | 107 ++++++++++++
 .../dolphinemu/settings/PrefsActivity.java    |   3 +
 .../{ => cpu}/CPUSettingsFragment.java        |   2 +-
 .../{ => input}/InputConfigFragment.java      |  13 +-
 .../input/InputOverlayConfigActivity.java     |  27 +++
 .../input/InputOverlayConfigButton.java       |  52 ++++++
 .../{ => video}/VideoSettingsFragment.java    |   2 +-
 17 files changed, 395 insertions(+), 87 deletions(-)
 create mode 100644 Source/Android/res/drawable/button_a.png
 create mode 100644 Source/Android/res/drawable/button_b.png
 create mode 100644 Source/Android/res/drawable/button_start.png
 create mode 100644 Source/Android/res/layout/input_overlay_config_layout.xml
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayItem.java
 rename Source/Android/src/org/dolphinemu/dolphinemu/settings/{ => cpu}/CPUSettingsFragment.java (96%)
 rename Source/Android/src/org/dolphinemu/dolphinemu/settings/{ => input}/InputConfigFragment.java (95%)
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigActivity.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java
 rename Source/Android/src/org/dolphinemu/dolphinemu/settings/{ => video}/VideoSettingsFragment.java (99%)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 2e3964c65f..5b2a3cfee9 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -38,6 +38,8 @@
         <activity android:name="org.dolphinemu.dolphinemu.emulation.EmulationActivity"
                   android:screenOrientation="landscape" />
 
+        <activity android:name="org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigActivity"/>
+
         <activity
             android:name="org.dolphinemu.dolphinemu.settings.PrefsActivity"
             android:label="@string/settings" />
diff --git a/Source/Android/res/drawable/button_a.png b/Source/Android/res/drawable/button_a.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e685324ae8a4ad016eb1033d64b659966cfcd0c
GIT binary patch
literal 5178
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

literal 0
HcmV?d00001

diff --git a/Source/Android/res/drawable/button_b.png b/Source/Android/res/drawable/button_b.png
new file mode 100644
index 0000000000000000000000000000000000000000..21da4c20f123fe6409b57cc6d837fd0f60786098
GIT binary patch
literal 4971
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%0AYS0a83w6
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

literal 0
HcmV?d00001

diff --git a/Source/Android/res/drawable/button_start.png b/Source/Android/res/drawable/button_start.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79a9269ee5f6b35eccbfa29767a52e8fe30c69c
GIT binary patch
literal 1511
zcmV<D1sM8?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000G6Nkl<ZSVy&&TS#3;6o$R)lZY?+<OOd}
z76n1Y`yB<9AR0wq6dwddi};|V)ljQ3g;*;IrnVBJXptzfk($$#P_4EEO|h-Ec-lmJ
zsNooDn<A#MR%7SeoRP`yxtXR1hJE(zb@^wlf32BuadG08mX_w1o}PXoBO~LX_<tn+
zAKMz4nVFA-%!fiY*a_2)MN(5!$MsHy@uS?_+-K?#bBB6RVr~KOj=fls5Q?>897v-$
zsHv&>er#;)+VSymtF<vVH`iBNTl-C3Uf!P6vw**RDiDNFaeUO;+WNUIr?%z?2M5QA
zkhCLGv*Z*A;e1{ym6Vh`I;~^9e0_cWvI63<T@d733ZrPv`QF~%xt*PzH@CL7I!q?h
z`OVGE^E`QHp6`0SzP`RGVfQ(<v$C?jvkHQoOXp2ZO<(Gb?C$QK!^!&kdgsc@O4riT
z(uKvv#U43$XP)oKA+OqiJ4#w7UH}18CE?1-%1nCatjuUMzO}r(+%1Uqj=^BKG(A22
z?$p#&-{j=vdpvn(p6|#ZkDh7^E=dr{$;q#sfDn^6E#W!PJKx^kZeLqldz+Qc&dy%K
z;mF9ym7$@bfve&-Ffi~wPu`j5J95aQhrVhvKR<sLUxJiI4S;3!T658}ofTkYet!NU
zD;ymiy^OQo-rk{}o}O!6U0v5ZJ3FuQ<ehoGBZoYC=&O;KnVGq&^oz3q&`M5_<Av3e
zL&C^PFg83qe5Jp?{{tLVR#tuz5D;K?b8|ZqYdH4u^4gDziZV7fHs0Vna>%2HK6X@2
zP+b<E%K$L(LIY7l1(C=l;bcV^Wu<~62Arm(q};2nuD&Ij(=7pLHaIx=XCEJ*rwt7a
zlgJ^D9{Sk9p0wZH-93X(c;_O^gV0C;N(nYYC~`_zSy@|K+jvk=kSQc2WD}>QrKO*W
zaffF`Ma6AbSJ$J&#Kil^A&(yV*ukD!qS7w_{uO?5MoGbHh(&JO+uKJ)dEW5%_y098
zFwk67RCHGmYF>1^FL?4^US4h>BFG_+9{Sk9p2`JDMh!qgLBSJ!_^E4h2)kL0Am~SR
zb#*smV`IN11%7^hzePt!uf@m5e@!}aa&i^`L1d6a9zFE2gFQ73lsmpP0ELBxJ1PJ=
z8|0zB2_rdeX=#}dJo%V#hlhthAlv|9czSy7hlYl3h-fVE9XaIDLmxZX!>;rrqP1ZY
z0PPh8@<*LhYR%2f6NHzX6ZV9Jg!=&T_4R$??(Y7#tOnA79P;R)j~(n`*C_ywB7hUZ
z9v2t45)%`%%2T9c6%dg0)Dg(e&i>0;4v=GVP0j(4l$5k2IY4g^-1yxY4#2yU6!6Dv
zHlKvYRu$l!Rf=8np0z5V7eq!z{^(2<$P*MK{6pV{?e&3(h=`xOy}kbgL~(KPT{v;(
z%$d)47hE_H<ht#s4=C;UIi1j8trBc?LW~RaUlD3q2_7CE2Vr4h59y42chm{1s;Z2Z
z{<8^yWVtzTrjuN-w-?Z4sB=mUw)5njc}IHzsTMx9!-?1tFUlS92PWuFDjENe-H?MV
zzC;xFPtF4z4rCNMIy&yCAYSEpz><4y^_;-;ry`9DY!dpT_p3M&5qimd5&8{V=R&PN
zbMa95Kt%q_nGomlt{`kbwRu^wT*0(U1w`RAt3RTh_Eb#RIqX=XdkE?69?dNv%#stF
zURGCEdtT;#U?H5Ab1|Mdbgm*3!gCS?ykPgTcP*0uNga0z(x~YF@=|w1Vc@J7JBlIr
zame-!Aa#hY_*e<Gygjq(*PXhO*%J~*-Vh)j=x@m?FdfJ(4!h1c{s*R_H~-Gbl8yiX
N002ovPDHLkV1h?J&&vP+

literal 0
HcmV?d00001

diff --git a/Source/Android/res/layout/emulation_view.xml b/Source/Android/res/layout/emulation_view.xml
index 62cbbe703e..c4648b577b 100644
--- a/Source/Android/res/layout/emulation_view.xml
+++ b/Source/Android/res/layout/emulation_view.xml
@@ -11,4 +11,12 @@
         android:focusable="false"
         android:focusableInTouchMode="false"/>
 
+        <!-- This is the onscreen input overlay -->
+    <org.dolphinemu.dolphinemu.emulation.overlay.InputOverlay 
+        android:id="@+id/emulationControlOverlay"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"/>
+
 </merge>
\ No newline at end of file
diff --git a/Source/Android/res/layout/input_overlay_config_layout.xml b/Source/Android/res/layout/input_overlay_config_layout.xml
new file mode 100644
index 0000000000..868f0b3166
--- /dev/null
+++ b/Source/Android/res/layout/input_overlay_config_layout.xml
@@ -0,0 +1,32 @@
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/inputLayout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
+        android:id="@+id/buttonA"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:background="@drawable/button_a" />
+
+    <org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
+        android:id="@+id/buttonStart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/buttonB"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/button_start" />
+
+    <org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
+        android:id="@+id/buttonB"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@+id/buttonStart"
+        android:background="@drawable/button_b" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml
index 899e559480..5dc15ac75e 100644
--- a/Source/Android/res/xml/input_prefs.xml
+++ b/Source/Android/res/xml/input_prefs.xml
@@ -2,86 +2,90 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   android:title="@string/input_settings">
+                  
+    <Preference
+        android:key="inputOverlayConfigPref"
+        android:title="Butts"/>
 
-        <PreferenceScreen android:title="@string/gamecube_bindings">
-            <Preference
-                android:key="InputA"
-                android:title="@string/button_a" />
+    <PreferenceScreen android:title="@string/gamecube_bindings">
+        <Preference
+            android:key="InputA"
+            android:title="@string/button_a" />
+    
+        <Preference
+            android:key="InputB"
+            android:title="@string/button_b" />
+    
+        <Preference
+            android:key="InputX"
+            android:title="@string/button_x" />
+    
+        <Preference
+            android:key="InputY"
+            android:title="@string/button_y" />
+    
+        <Preference
+            android:key="InputZ"
+            android:title="@string/button_z" />
+    
+        <Preference
+            android:key="InputStart"
+            android:title="@string/button_start" />
+    
+        <Preference
+            android:key="DPadUp"
+            android:title="@string/dpad_up" />
+    
+        <Preference
+            android:key="DPadDown"
+            android:title="@string/dpad_down" />
+    
+        <Preference
+               android:key="DPadLeft"
+               android:title="@string/dpad_left" />
+    
+        <Preference
+               android:key="DPadRight"
+               android:title="@string/dpad_right" />
+    
+        <Preference
+            android:key="MainUp"
+            android:title="@string/main_stick_up" />
+    
+        <Preference
+            android:key="MainDown"
+            android:title="@string/main_stick_down" />
+    
+        <Preference
+            android:key="MainLeft"
+            android:title="@string/main_stick_left" />
+    
+        <Preference
+            android:key="MainRight"
+            android:title="@string/main_stick_right" />
+    
+        <Preference
+            android:key="CStickUp"
+            android:title="@string/c_stick_up" />
+    
+        <Preference
+            android:key="CStickDown"
+            android:title="@string/c_stick_down" />
+    
+        <Preference
+            android:key="CStickLeft"
+            android:title="@string/c_stick_left" />
+    
+        <Preference
+            android:key="CStickRight"
+            android:title="@string/c_stick_right" />
+    
+        <Preference
+            android:key="InputL"
+            android:title="@string/trigger_left" />
         
-            <Preference
-                android:key="InputB"
-                android:title="@string/button_b" />
-        
-            <Preference
-                android:key="InputX"
-                android:title="@string/button_x" />
-        
-            <Preference
-                android:key="InputY"
-                android:title="@string/button_y" />
-        
-            <Preference
-                android:key="InputZ"
-                android:title="@string/button_z" />
-        
-            <Preference
-                android:key="InputStart"
-                android:title="@string/button_start" />
-        
-            <Preference
-                android:key="DPadUp"
-                android:title="@string/dpad_up" />
-        
-            <Preference
-                android:key="DPadDown"
-                android:title="@string/dpad_down" />
-        
-            <Preference
-                   android:key="DPadLeft"
-                   android:title="@string/dpad_left" />
-        
-            <Preference
-                   android:key="DPadRight"
-                   android:title="@string/dpad_right" />
-        
-            <Preference
-                android:key="MainUp"
-                android:title="@string/main_stick_up" />
-        
-            <Preference
-                android:key="MainDown"
-                android:title="@string/main_stick_down" />
-        
-            <Preference
-                android:key="MainLeft"
-                android:title="@string/main_stick_left" />
-        
-            <Preference
-                android:key="MainRight"
-                android:title="@string/main_stick_right" />
-        
-            <Preference
-                android:key="CStickUp"
-                android:title="@string/c_stick_up" />
-        
-            <Preference
-                android:key="CStickDown"
-                android:title="@string/c_stick_down" />
-        
-            <Preference
-                android:key="CStickLeft"
-                android:title="@string/c_stick_left" />
-        
-            <Preference
-                android:key="CStickRight"
-                android:title="@string/c_stick_right" />
-        
-            <Preference
-                android:key="InputL"
-                android:title="@string/trigger_left" />
-            
-            <Preference
-                android:key="InputR"
-                android:title="@string/trigger_right" />
-        </PreferenceScreen>
+        <Preference
+            android:key="InputR"
+            android:title="@string/trigger_right" />
+    </PreferenceScreen>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
index 8b29e607d7..3695bfa40b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
@@ -20,7 +20,7 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
+import org.dolphinemu.dolphinemu.settings.video.VideoSettingsFragment;
 
 /**
  * Represents the about screen.
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
index 912fc021c5..8b8f4e0551 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
@@ -21,8 +21,8 @@ import android.view.WindowManager.LayoutParams;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.settings.InputConfigFragment;
-import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
+import org.dolphinemu.dolphinemu.settings.input.InputConfigFragment;
+import org.dolphinemu.dolphinemu.settings.video.VideoSettingsFragment;
 
 import java.util.List;
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
new file mode 100644
index 0000000000..c2272fdc5f
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java
@@ -0,0 +1,64 @@
+package org.dolphinemu.dolphinemu.emulation.overlay;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.View.OnTouchListener;
+
+/**
+ * Draws the interactive input overlay on top of the
+ * {@link NativeGLSurfaceView} that is rendering emulation.
+ */
+public final class InputOverlay extends SurfaceView implements OnTouchListener
+{
+	private final Set<InputOverlayItem> overlayItems = new HashSet<InputOverlayItem>();
+
+	/**
+	 * Constructor
+	 * 
+	 * @param context The current {@link Context}.
+	 * @param attrs   {@link AttributeSet} for parsing XML attributes.
+	 */
+	public InputOverlay(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+
+		// Force draw
+		setWillNotDraw(false);
+
+		// Request focus for the overlay so it has priority on presses.
+		requestFocus();
+	}
+
+	@Override
+	public boolean onTouch(View v, MotionEvent event)
+	{
+		switch (event.getAction())
+		{
+			case MotionEvent.ACTION_DOWN:
+			{
+				// TODO: Handle down presses.
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public void onDraw(Canvas canvas)
+	{
+		super.onDraw(canvas);
+
+		for (InputOverlayItem item : overlayItems)
+		{
+			item.draw(canvas);
+		}
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayItem.java
new file mode 100644
index 0000000000..a45578b263
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayItem.java
@@ -0,0 +1,107 @@
+package org.dolphinemu.dolphinemu.emulation.overlay;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+
+/**
+ * Represents a drawable image for the {@link InputOverlay}
+ */
+public final class InputOverlayItem
+{
+	// The image as a BitmapDrawable
+	private BitmapDrawable drawable;
+	
+	// Width and height of the underlying image.
+	private int width;
+	private int height;
+
+	// X and Y coordinates to display this item at.
+	private int x;
+	private int y;
+
+	// Image scale factor.
+	private float scaleFactor = 1.0f;
+
+	// Rectangle that we draw this item to.
+	private Rect drawRect;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param res   Reference to the app resources for fetching display metrics.
+	 * @param resId Resource ID of the {@link BitmapDrawable} to encapsulate.
+	 */
+	public InputOverlayItem(Resources res, int resId)
+	{
+		// Idiot-proof the constructor.
+		if (res == null)
+			throw new IllegalArgumentException("res cannot be null");
+
+		// Everything is valid, decode the filename as a bitmap.
+		drawable = (BitmapDrawable) res.getDrawable(resId);
+		Bitmap image = drawable.getBitmap();
+
+		// Set width/height
+		width = image.getWidth();
+		height = image.getHeight();
+
+		// Initialize rectangle to zero width, height, x, and y.
+		drawRect = new Rect();
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param res   Reference to the app resources for fetching display metrics.
+	 * @param resId Resource ID of the {@link BitmapDrawable} to encapsulate.
+	 * @param x     X coordinate on the screen to place the control.
+	 * @param y     Y coordinate on the screen to place the control.
+	 */
+	public InputOverlayItem(Resources res, int resId, int x, int y)
+	{
+		this(res, resId);
+
+		setPosition(x, y);
+	}
+
+	/**
+	 * Sets the position of this item on the screen.
+	 * 
+	 * @param x New x-coordinate for this image.
+	 * @param y New y-coordinate for this image.
+	 */
+	public void setPosition(int x, int y)
+	{
+		this.x = x;
+		this.y = y;
+
+		drawRect.set(x, y, x + (int)(width * scaleFactor), y + (int)(height * scaleFactor));
+		drawable.setBounds(drawRect);
+	}
+
+	/**
+	 * Sets a new scaling factor for the current image.
+	 * 
+	 * @param scaleFactor The new scaling factor. Note that 1.0 is normal size.
+	 */
+	public void setScaleFactor(float scaleFactor)
+	{
+		this.scaleFactor = scaleFactor;
+
+		// Adjust for the new scale factor.
+		setPosition(x, y);
+	}
+
+	/**
+	 * Draws this item to a given canvas.
+	 * 
+	 * @param canvas The canvas to draw this item to.
+	 */
+	public void draw(Canvas canvas)
+	{
+		drawable.draw(canvas);
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
index 51153866e1..5368475319 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/PrefsActivity.java
@@ -7,6 +7,9 @@
 package org.dolphinemu.dolphinemu.settings;
 
 import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.settings.cpu.CPUSettingsFragment;
+import org.dolphinemu.dolphinemu.settings.input.InputConfigFragment;
+import org.dolphinemu.dolphinemu.settings.video.VideoSettingsFragment;
 
 import android.app.ActionBar;
 import android.app.ActionBar.Tab;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
similarity index 96%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
index 47f0cb7d35..77caec2b83 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/cpu/CPUSettingsFragment.java
@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.settings;
+package org.dolphinemu.dolphinemu.settings.cpu;
 
 import org.dolphinemu.dolphinemu.R;
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
similarity index 95%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
index a23f1b4a3f..2ada44ccff 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
@@ -4,12 +4,13 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.settings;
+package org.dolphinemu.dolphinemu.settings.input;
 
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -115,9 +116,17 @@ public final class InputConfigFragment extends PreferenceFragment
 
 			// Everything is set, show the dialog.
 			dialog.show();
+			return true;
 		}
 
-		return true;
+		if (pref.getKey().equals("inputOverlayConfigPref"))
+		{
+			Intent inputOverlayConfig = new Intent(getActivity(), InputOverlayConfigActivity.class);
+			startActivity(inputOverlayConfig);
+			return true;
+		}
+
+		return false;
 	}
 
 	/**
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigActivity.java
new file mode 100644
index 0000000000..3084c181d1
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigActivity.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.settings.input;
+
+import org.dolphinemu.dolphinemu.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * {@link Activity} used for configuring the input overlay.
+ */
+public final class InputOverlayConfigActivity extends Activity
+{
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		// Set the initial layout.
+		setContentView(R.layout.input_overlay_config_layout);
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java
new file mode 100644
index 0000000000..cca596e85c
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputOverlayConfigButton.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
+package org.dolphinemu.dolphinemu.settings.input;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.widget.Button;
+
+/**
+ * A movable {@link Button} for use within the
+ * input overlay configuration screen.
+ */
+public final class InputOverlayConfigButton extends Button implements OnTouchListener
+{
+	/**
+	 * Constructor
+	 * 
+	 * @param context The current {@link Context}.
+	 * @param attribs {@link AttributeSet} for parsing XML attributes.
+	 */
+	public InputOverlayConfigButton(Context context, AttributeSet attribs)
+	{
+		super(context, attribs);
+
+		// Set the button as its own OnTouchListener.
+		setOnTouchListener(this);
+	}
+
+	@Override
+	public boolean onTouch(View v, MotionEvent event)
+	{
+		switch(event.getAction())
+		{
+			// Only change the X/Y coordinates when we move the button.
+			case MotionEvent.ACTION_MOVE:
+			{
+				setX(getX() + event.getX());
+				setY(getY() + event.getY());
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
similarity index 99%
rename from Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
index fffea888a7..47f9ef475f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
@@ -4,7 +4,7 @@
  * Refer to the license.txt file included.
  */
 
-package org.dolphinemu.dolphinemu.settings;
+package org.dolphinemu.dolphinemu.settings.video;
 
 import android.app.Activity;
 import android.content.SharedPreferences;