diff --git a/Source/Android/.idea/vcs.xml b/Source/Android/.idea/vcs.xml
index a5dd08645f..def6a6a184 100644
--- a/Source/Android/.idea/vcs.xml
+++ b/Source/Android/.idea/vcs.xml
@@ -2,7 +2,6 @@
-
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 5482878f58..49334515f9 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -9,15 +9,16 @@
-
-
-
-
-
+
-
+
+
+
+
+
+
@@ -78,10 +79,46 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -106,13 +143,19 @@
-
-
-
+
+
+
@@ -121,14 +164,14 @@
-
+
-
+
@@ -140,6 +183,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -148,101 +211,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -263,6 +284,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -284,11 +374,6 @@
-
-
-
-
@@ -329,12 +414,17 @@
-
+
+
+
+
+
+
-
+
@@ -357,32 +447,32 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -417,7 +507,7 @@
-
+
@@ -446,21 +536,13 @@
-
+
-
+
-
-
-
-
-
-
-
-
@@ -481,9 +563,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 82573aa8aa..2eb749d1a2 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -31,12 +31,18 @@
android:theme="@android:style/Theme"
android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
-
+
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index d90bb32016..96b67c2130 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -1,38 +1,26 @@
package org.dolphinemu.dolphinemu;
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+import net.simonvt.menudrawer.MenuDrawer;
+
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.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.Surface;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
public class GameListView extends ListActivity {
private GameListAdapter adapter;
- private static List currentDir;
private MenuDrawer mDrawer;
private SideMenuAdapter mAdapter;
- private ListView mList;
private static GameListView me;
public static native String GetConfig(String Key, String Value, String Default);
public static native void SetConfig(String Key, String Value, String Default);
@@ -66,7 +54,7 @@ public class GameListView extends ListActivity {
fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
}
}
- catch(Exception e)
+ catch(Exception ignored)
{
}
}
@@ -78,13 +66,10 @@ public class GameListView extends ListActivity {
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
- // TODO Auto-generated method stub
super.onListItemClick(l, v, position, id);
GameListItem o = adapter.getItem(position);
- if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){
- }
- else
- {
+ if(!(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")))
+ {
onFileClick(o.getPath());
}
}
@@ -131,8 +116,9 @@ public class GameListView extends ListActivity {
Listdir = new ArrayList();
dir.add(new SideMenuItem("Browse Folder", 0));
+ dir.add(new SideMenuItem("Settings", 1));
- mList = new ListView(this);
+ ListView mList = new ListView(this);
mAdapter = new SideMenuAdapter(this,R.layout.sidemenu,dir);
mList.setAdapter(mAdapter);
mList.setOnItemClickListener(mItemClickListener);
@@ -150,6 +136,11 @@ public class GameListView extends ListActivity {
Intent ListIntent = new Intent(me, FolderBrowser.class);
startActivityForResult(ListIntent, 1);
break;
+ case 1:
+ Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
+ Intent SettingIntent = new Intent(me, SettingBrowser.class);
+ startActivityForResult(SettingIntent, 1);
+ break;
default:
break;
}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
new file mode 100644
index 0000000000..123bb174ed
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
@@ -0,0 +1,56 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
+public class SettingBrowser extends ListActivity {
+ private SettingMenuAdapter adapter;
+ private void Fill()
+ {
+ this.setTitle("Settings");
+ List dir = new ArrayList();
+
+ dir.add(new SettingMenuItem("Setting 1", "SubTitle 1", 0));
+ Collections.sort(dir);
+
+ adapter = new SettingMenuAdapter(this,R.layout.folderbrowser,dir);
+ this.setListAdapter(adapter);
+ }
+
+ @Override
+ protected void onListItemClick(ListView l, View v, int position, long id) {
+ super.onListItemClick(l, v, position, id);
+ SettingMenuItem o = adapter.getItem(position);
+ switch (o.getID())
+ {
+ default:
+ // Do nothing yet
+ break;
+ }
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+
+ Fill();
+ }
+ @Override
+ public void onBackPressed() {
+ this.finish();
+ super.onBackPressed();
+ }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
new file mode 100644
index 0000000000..8fb0b237f6
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
@@ -0,0 +1,60 @@
+package org.dolphinemu.dolphinemu;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
+public class SettingMenuAdapter extends ArrayAdapter{
+
+ private Context c;
+ private int id;
+ private Listitems;
+
+ public SettingMenuAdapter(Context context, int textViewResourceId,
+ List objects) {
+ super(context, textViewResourceId, objects);
+ c = context;
+ id = textViewResourceId;
+ items = objects;
+ }
+ public SettingMenuItem getItem(int i)
+ {
+ return items.get(i);
+ }
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ View v = convertView;
+ if (v == null) {
+ LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ v = vi.inflate(id, null);
+ if (v == null)
+ return null; // This should never be hit, but have it to clear a warning
+ }
+ final SettingMenuItem o = items.get(position);
+ if (o != null) {
+ TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+ TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+
+ if (t1 != null)
+ t1.setText(o.getName());
+ if (t2 != null)
+ t2.setText(o.getSubtitle());
+ }
+ return v;
+ }
+
+
+
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java
new file mode 100644
index 0000000000..fcb0da942c
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java
@@ -0,0 +1,37 @@
+package org.dolphinemu.dolphinemu;
+
+public class SettingMenuItem implements Comparable{
+ private String name;
+ private String subtitle;
+ private int m_id;
+
+ public SettingMenuItem(String n,String d, int id)
+ {
+ name = n;
+ subtitle = d;
+ m_id = id;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getSubtitle()
+ {
+ return subtitle;
+ }
+ public int getID()
+ {
+ return m_id;
+ }
+
+ public int compareTo(SettingMenuItem o)
+ {
+ if(this.name != null)
+ return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
+ else
+ throw new IllegalArgumentException();
+ }
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
index 80f3eaec64..e24842bed1 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
@@ -1,5 +1,11 @@
package org.dolphinemu.dolphinemu;
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
public class SideMenuItem implements Comparable{
private String m_name;
private int m_id;