diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 87d98b0e1e..b6b28566ce 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -13,14 +13,6 @@
android-17
-
-
-
- Nexus 4
- @android:style/Theme.Holo
-
-
-
@@ -40,8 +32,9 @@
-
+
+
@@ -61,7 +54,6 @@
-
@@ -98,6 +90,7 @@
+
@@ -110,26 +103,19 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -137,8 +123,10 @@
-
-
+
+
+
+
@@ -146,7 +134,7 @@
-
+
@@ -173,7 +161,6 @@
@@ -225,6 +214,7 @@
+
@@ -263,7 +253,6 @@
-
@@ -375,56 +364,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -445,12 +403,31 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -469,18 +446,30 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -551,11 +540,13 @@
+
+
-
+
@@ -579,32 +570,32 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
-
+
+
+
+
+
@@ -668,6 +659,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -704,13 +737,6 @@
-
-
-
-
-
-
-
@@ -720,30 +746,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -751,6 +753,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 060807d63c..c3d6d8ae06 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -1,11 +1,5 @@
package org.dolphinemu.dolphinemu;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -16,6 +10,8 @@ import android.util.Log;
import android.view.MotionEvent;
import android.view.WindowManager;
+import java.io.*;
+
public class DolphinEmulator extends Activity
{
static private NativeGLSurfaceView GLview = null;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 68203413b7..15afb36c3c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -1,29 +1,19 @@
package org.dolphinemu.dolphinemu;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
import android.app.Activity;
import android.app.ListActivity;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
-import android.view.Gravity;
-import android.view.LayoutInflater;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class FolderBrowser extends ListActivity {
private GameListAdapter adapter;
@@ -87,12 +77,18 @@ public class FolderBrowser extends ListActivity {
Fill(currentDir);
}
@Override
- public void onBackPressed() {
+ public boolean onCreateOptionsMenu(Menu menu)
+ {
+ menu.add("Add current folder");
+ return true;
+ }
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
Intent intent = new Intent();
intent.putExtra("Select", currentDir.getPath());
setResult(Activity.RESULT_OK, intent);
-
- this.finish();
- super.onBackPressed();
+
+ this.finish();
+ return true;
}
}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index 760f0445ec..ad2df58fa3 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -39,7 +39,7 @@ public class GameListView extends ListActivity {
int intDirectories = Integer.parseInt(Directories);
for (int a = 0; a < intDirectories; ++a)
{
- String BrowseDir = GetConfig("General", "GCMPaths" + Integer.toString(a), "");
+ String BrowseDir = GetConfig("General", "GCMPath" + Integer.toString(a), "");
File currentDir = new File(BrowseDir);
File[]dirs = currentDir.listFiles();
try
@@ -105,7 +105,7 @@ public class GameListView extends ListActivity {
int intDirectories = Integer.parseInt(Directories);
Directories = Integer.toString(intDirectories + 1);
SetConfig("General", "GCMPathes", Directories);
- SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
+ SetConfig("General", "GCMPath" + Integer.toString(intDirectories), FileName);
Fill();
}