Add a Androind ControllerInterface class for allowing input in a non-hacky way. Add a default GCPad.ini file so it actually works.

2 files changed, 42 insertions, 13 deletions

diff --git a/Source/Android/assets/GCPadNew.ini b/Source/Android/assets/GCPadNew.ini
new file mode 100644
index 0000000000..cb828f9960
--- /dev/null
+++ b/Source/Android/assets/GCPadNew.ini
@@ -0,0 +1,29 @@
+[GCPad1]
+Device = Android/0/Touchscreen
+Buttons/A = Button 0
+Buttons/B = Button 1
+Buttons/X = C
+Buttons/Y = S
+Buttons/Z = D
+Buttons/Start = Button 2
+Main Stick/Up = Up
+Main Stick/Down = Down
+Main Stick/Left = Left
+Main Stick/Right = Right
+Main Stick/Modifier = Shift_L
+Main Stick/Modifier/Range = 50.000000
+C-Stick/Up = I
+C-Stick/Down = K
+C-Stick/Left = J
+C-Stick/Right = L
+C-Stick/Modifier = Control_L
+C-Stick/Modifier/Range = 50.000000
+Triggers/L = Q
+Triggers/R = W
+D-Pad/Up = T
+D-Pad/Down = G
+D-Pad/Left = F
+D-Pad/Right = H
+[GCPad2]
+[GCPad3]
+[GCPad4]
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 5c79ab94fd..d94033a95e 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -59,6 +59,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 	      out.write(buffer, 0, read);
 	    }
 	}
+	
 	@Override
 	public void onStop()
 	{
@@ -85,22 +86,15 @@ public class DolphinEmulator<MainActivity> extends Activity
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
 		if (savedInstanceState == null)
 		{
 			Intent ListIntent = new Intent(this, NativeListView.class);
 			startActivityForResult(ListIntent, 1);
 			
 			// Make the assets directory
-			try
-			{
-				File directory = new File(Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu");
-				directory.mkdirs();
-			}		
-			catch (Exception ex)
-			{
-				Log.w("me", ex.toString());
-			}
+			File directory = new File(
+					Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"+File.separator+"Config");
+			directory.mkdirs();
 			
 			// Copy assets if needed
 			java.io.File file = new java.io.File(
@@ -108,11 +102,17 @@ public class DolphinEmulator<MainActivity> extends Activity
 			if(!file.exists())
 			{
 				CopyAsset("ButtonA.png", 
-						Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "ButtonA.png");
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "ButtonA.png");
 				CopyAsset("ButtonB.png", 
-						Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "ButtonB.png");
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "ButtonB.png");
 				CopyAsset("ButtonStart.png", 
-						Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "ButtonStart.png");
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "ButtonStart.png");
+				CopyAsset("GCPadNew.ini", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator +"Config"+ File.separator +"GCPadNew.ini");
 			}
 		}
 	}