summaryrefslogtreecommitdiff
path: root/Source/Android/src
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2013-06-24 01:23:24 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2013-06-24 01:42:35 -0500
commit5f9199830285639a03d82e211de776e9d3e73a66 (patch)
treebe060931f78734287637739f166c423de5fc7082 /Source/Android/src
parent852698ceef5a4a48aff89e83a9356e7f03e4bf02 (diff)
[Android] Add default Android config file
Diffstat (limited to 'Source/Android/src')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java17
1 files changed, 14 insertions, 3 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index d8559c1393..2cc19d3955 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -3,8 +3,10 @@ package org.dolphinemu.dolphinemu;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Environment;
+import android.preference.PreferenceManager;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.InputDevice;
@@ -91,7 +93,8 @@ public class DolphinEmulator<MainActivity> extends Activity
// Copy assets if needed
java.io.File file = new java.io.File(
- Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "NoBanner.png");
+ Environment.getExternalStorageDirectory()+File.separator+
+ "dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");
if(!file.exists())
{
CopyAsset("ButtonA.png",
@@ -108,7 +111,15 @@ public class DolphinEmulator<MainActivity> extends Activity
"dolphin-emu" + File.separator + "NoBanner.png");
CopyAsset("GCPadNew.ini",
Environment.getExternalStorageDirectory()+File.separator+
- "dolphin-emu" + File.separator +"Config"+ File.separator +"GCPadNew.ini");
+ "dolphin-emu" + File.separator + "Config" + File.separator + "GCPadNew.ini");
+ CopyAsset("GCPadNew.ini",
+ Environment.getExternalStorageDirectory()+File.separator+
+ "dolphin-emu" + File.separator + "Config" + File.separator +"Dolphin.ini");
+
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ SharedPreferences.Editor editor = prefs.edit();
+ editor.clear();
+ editor.commit();
}
}
}
@@ -129,7 +140,7 @@ public class DolphinEmulator<MainActivity> extends Activity
String FileName = data.getStringExtra("Select");
GLview = new NativeGLSurfaceView(this);
this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "OGL");
+ String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer");
if (backend.equals("OGL"))
GLview.SetDimensions(screenHeight, screenWidth);
else