244 changes: 96 additions & 148 deletions Source/Android/.idea/workspace.xml
4 changes: 2 additions & 2 deletions Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.dolphinemu.dolphinemu"
android:versionCode="6"
android:versionName="0.6" >
android:versionCode="7"
android:versionName="0.7" >

<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>

Expand Down
Expand Up @@ -112,9 +112,9 @@ public void onCreate(Bundle savedInstanceState) {
CopyAsset("GCPadNew.ini",
Environment.getExternalStorageDirectory()+File.separator+
"dolphin-emu" + File.separator + "Config" + File.separator + "GCPadNew.ini");
CopyAsset("GCPadNew.ini",
CopyAsset("Dolphin.ini",
Environment.getExternalStorageDirectory()+File.separator+
"dolphin-emu" + File.separator + "Config" + File.separator +"Dolphin.ini");
"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");

SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor editor = prefs.edit();
Expand Down