284 changes: 164 additions & 120 deletions Source/Android/.idea/workspace.xml
View file

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
View file
@@ -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;
Expand All @@ -16,6 +10,8 @@
import android.view.MotionEvent;
import android.view.WindowManager;

import java.io.*;

public class DolphinEmulator<MainActivity> extends Activity
{
static private NativeGLSurfaceView GLview = null;
Expand Down
36 changes: 16 additions & 20 deletions Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
View file
@@ -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;
Expand Down Expand Up @@ -87,12 +77,18 @@ public void onCreate(Bundle savedInstanceState)
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;
}
}
4 changes: 2 additions & 2 deletions Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
View file
Expand Up @@ -39,7 +39,7 @@ private void Fill()
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
Expand Down Expand Up @@ -105,7 +105,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data)
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();
}
Expand Down