From bd72e13dd42a2ad276e5836570972c601a74e562 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 23 Apr 2013 14:21:48 -0500
Subject: [PATCH] Generally make the Android UI better.

---
 Source/Android/AndroidManifest.xml            |   8 +-
 Source/Android/assets/Dolphin.png             | Bin 4789 -> 0 bytes
 Source/Android/project.properties             |   1 +
 Source/Android/res/layout/folderbrowser.xml   |  44 +++++
 .../res/layout/folderbrowserfooter.xml        |   7 +
 Source/Android/res/layout/main.xml            |  52 +++--
 Source/Android/res/layout/sidemenu.xml        |  31 +++
 .../dolphinemu/DolphinEmulator.java           |  16 +-
 .../dolphinemu/dolphinemu/FolderBrowser.java  |  98 ++++++++++
 ...ArrayAdapter.java => GameListAdapter.java} |  16 +-
 .../dolphinemu/dolphinemu/GameListItem.java   |  84 ++++++++
 .../dolphinemu/dolphinemu/GameListView.java   | 181 ++++++++++++++++++
 .../dolphinemu/dolphinemu/NativeListView.java |  94 ---------
 .../src/org/dolphinemu/dolphinemu/Option.java |  38 ----
 .../dolphinemu/SideMenuAdapter.java           |  49 +++++
 .../dolphinemu/dolphinemu/SideMenuItem.java   |  30 +++
 Source/Core/DolphinWX/Src/MainAndroid.cpp     | 115 ++++++++++-
 17 files changed, 704 insertions(+), 160 deletions(-)
 delete mode 100644 Source/Android/assets/Dolphin.png
 create mode 100644 Source/Android/res/layout/folderbrowser.xml
 create mode 100644 Source/Android/res/layout/folderbrowserfooter.xml
 create mode 100644 Source/Android/res/layout/sidemenu.xml
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
 rename Source/Android/src/org/dolphinemu/dolphinemu/{FileArrayAdapter.java => GameListAdapter.java} (71%)
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/NativeListView.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/Option.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 624f7b2df9..82573aa8aa 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -26,7 +26,13 @@
             </intent-filter>
         </activity>
         <activity 
-            android:name=".NativeListView"
+            android:name="org.dolphinemu.dolphinemu.GameListView"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+        </activity>
+                <activity 
+            android:name="org.dolphinemu.dolphinemu.FolderBrowser"
             android:label="@string/app_name"
             android:theme="@android:style/Theme"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
diff --git a/Source/Android/assets/Dolphin.png b/Source/Android/assets/Dolphin.png
deleted file mode 100644
index 74d6c888016a4eeb6bf8d354213b4743d16b6f58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4789
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
JuZ<r({Xg_Z6l?$h

diff --git a/Source/Android/project.properties b/Source/Android/project.properties
index a3ee5ab64f..91be165ce3 100644
--- a/Source/Android/project.properties
+++ b/Source/Android/project.properties
@@ -12,3 +12,4 @@
 
 # Project target.
 target=android-17
+android.library.reference.1=../../Externals/android-menudrawer/library
diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/folderbrowser.xml
new file mode 100644
index 0000000000..ae480d0807
--- /dev/null
+++ b/Source/Android/res/layout/folderbrowser.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="@+id/TextView01"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/TextView02"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:text="@+id/TextView02" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+</LinearLayout>
diff --git a/Source/Android/res/layout/folderbrowserfooter.xml b/Source/Android/res/layout/folderbrowserfooter.xml
new file mode 100644
index 0000000000..9c0e11d81b
--- /dev/null
+++ b/Source/Android/res/layout/folderbrowserfooter.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/main.xml b/Source/Android/res/layout/main.xml
index 6116f6c33d..1b19ad19fe 100644
--- a/Source/Android/res/layout/main.xml
+++ b/Source/Android/res/layout/main.xml
@@ -1,26 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/TextView01"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginTop="5dip"
-        android:singleLine="true"
-        android:text="@+id/TextView01"
-        android:textStyle="bold" >
-    </TextView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
 
-    <TextView
-        android:id="@+id/TextView02"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip"
-        android:text="@+id/TextView02" >
-    </TextView>
+        <ImageView
+            android:id="@+id/imageView1"
+            android:layout_width="96dp"
+            android:layout_height="match_parent" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="@+id/TextView01"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/TextView02"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:text="@+id/TextView02" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
new file mode 100644
index 0000000000..57ab67e3ca
--- /dev/null
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="left"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dip"
+                android:layout_marginTop="5dip"
+                android:singleLine="true"
+                android:text="@+id/TextView01"
+                android:textAppearance="?android:attr/textAppearanceLarge" 
+                android:textStyle="bold" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index a989bf68d5..82d186de26 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import net.simonvt.menudrawer.MenuDrawer;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -88,7 +90,8 @@ public class DolphinEmulator<MainActivity> extends Activity
 		super.onCreate(savedInstanceState);
 		if (savedInstanceState == null)
 		{
-			Intent ListIntent = new Intent(this, NativeListView.class);
+
+			Intent ListIntent = new Intent(this, GameListView.class);
 			startActivityForResult(ListIntent, 1);
 			
 			// Make the assets directory
@@ -120,13 +123,22 @@ public class DolphinEmulator<MainActivity> extends Activity
 				CopyAsset("Dolphin.png", 
 						Environment.getExternalStorageDirectory()+File.separator+
 						"dolphin-emu" + File.separator + "Dolphin.png");
+				CopyAsset("Back.png", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "Back.png");
+				CopyAsset("Folder.png", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "Folder.png");
+				CopyAsset("Background.glsl", 
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "Background.glsl");
 				CopyAsset("GCPadNew.ini", 
 						Environment.getExternalStorageDirectory()+File.separator+
 						"dolphin-emu" + File.separator +"Config"+ File.separator +"GCPadNew.ini");
 			}
 		}
 	}
-	
+
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data)
 	{
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
new file mode 100644
index 0000000000..68203413b7
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -0,0 +1,98 @@
+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.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;
+
+public class FolderBrowser extends ListActivity {
+	private GameListAdapter adapter;
+	private static File currentDir = null;
+	private void Fill(File f)
+    {
+		File[]dirs = f.listFiles();
+		this.setTitle("Current Dir: " + f.getName());
+		List<GameListItem>dir = new ArrayList<GameListItem>();
+		List<GameListItem>fls = new ArrayList<GameListItem>();
+         
+		try
+		{
+			for(File ff: dirs)
+			{
+				if (ff.getName().charAt(0) != '.')
+					if(ff.isDirectory())
+	                	dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath()));
+					else
+						if (ff.getName().toLowerCase().contains(".gcm") ||
+		                		ff.getName().toLowerCase().contains(".iso") ||
+		                		ff.getName().toLowerCase().contains(".wbfs") ||
+		                		ff.getName().toLowerCase().contains(".gcz") ||
+		                		ff.getName().toLowerCase().contains(".dol") ||
+		                		ff.getName().toLowerCase().contains(".elf"))
+		                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+             }
+         }
+         catch(Exception e)
+         {
+         }
+         
+		Collections.sort(dir);
+        Collections.sort(fls);
+        dir.addAll(fls);
+         if (!f.getName().equalsIgnoreCase("sdcard"))
+        	 dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent()));
+
+         adapter = new GameListAdapter(this,R.layout.folderbrowser,dir);
+		 this.setListAdapter(adapter);
+    }
+
+	@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")){
+			currentDir = new File(o.getPath());
+			Fill(currentDir);
+		}
+	}
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) 
+	{
+		super.onCreate(savedInstanceState);
+		 
+		if(currentDir == null)
+			currentDir = new File(Environment.getExternalStorageDirectory().getPath());
+		Fill(currentDir);
+	}
+    @Override
+    public void onBackPressed() {
+        Intent intent = new Intent();
+        intent.putExtra("Select", currentDir.getPath());
+        setResult(Activity.RESULT_OK, intent);
+        
+    	this.finish();
+    	super.onBackPressed();
+    }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FileArrayAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
similarity index 71%
rename from Source/Android/src/org/dolphinemu/dolphinemu/FileArrayAdapter.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
index b49149a36c..f0aa522a1f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FileArrayAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
@@ -7,22 +7,23 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 
-public class FileArrayAdapter extends ArrayAdapter<Option>{
+public class GameListAdapter extends ArrayAdapter<GameListItem>{
 
 	private Context c;
 	private int id;
-	private List<Option>items;
+	private List<GameListItem>items;
 	
-	public FileArrayAdapter(Context context, int textViewResourceId,
-			List<Option> objects) {
+	public GameListAdapter(Context context, int textViewResourceId,
+			List<GameListItem> objects) {
 		super(context, textViewResourceId, objects);
 		c = context;
 		id = textViewResourceId;
 		items = objects;
 	}
-	public Option getItem(int i)
+	public GameListItem getItem(int i)
 	 {
 		 return items.get(i);
 	 }
@@ -33,15 +34,18 @@ public class FileArrayAdapter extends ArrayAdapter<Option>{
                   LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
                   v = vi.inflate(id, null);
               }
-              final Option o = items.get(position);
+              final GameListItem o = items.get(position);
               if (o != null) {
                       TextView t1 = (TextView) v.findViewById(R.id.TextView01);
                       TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+                      ImageView v1 = (ImageView) v.findViewById(R.id.imageView1);
                       
                       if(t1!=null)
                       	t1.setText(o.getName());
                       if(t2!=null)
                       	t2.setText(o.getData());
+                      if(v1!=null)
+                    	  v1.setImageBitmap(o.getImage());
                       
               }
               return v;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
new file mode 100644
index 0000000000..87137db48d
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
@@ -0,0 +1,84 @@
+package org.dolphinemu.dolphinemu;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+
+public class GameListItem implements Comparable<GameListItem>{
+    private String name;
+    private String data;
+    private String path;
+    private Bitmap image;
+    public static native int[] GetBanner(String filename);
+    public static native String GetTitle(String filename);
+	static
+	{
+		try
+		{
+			System.loadLibrary("dolphin-emu-nogui"); 
+		}
+		catch (Exception ex)
+		{
+			Log.w("me", ex.toString());
+		}
+	}
+    
+    public GameListItem(Context ctx, String n,String d,String p)
+    {
+        name = n;
+        data = d;
+        path = p;
+        File file = new File(path);
+        if (!file.isDirectory())
+        {
+        	int[] Banner = GetBanner(path);
+        	if (Banner[0] == 0)
+        	{
+        		try {
+					InputStream path = ctx.getAssets().open("NoBanner.png");
+					image = BitmapFactory.decodeStream(path);
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+        		
+        	}
+        	else
+        		image = Bitmap.createBitmap(Banner, 96, 32, Bitmap.Config.ARGB_8888);
+        	name = GetTitle(path);
+        }
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+    
+    public String getData()
+    {
+        return data;
+    }
+    
+    public String getPath()
+    {
+        return path;
+    }
+    public Bitmap getImage()
+    {
+    	return image;
+    }
+    
+    public int compareTo(GameListItem 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/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
new file mode 100644
index 0000000000..d585ead372
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -0,0 +1,181 @@
+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.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 File currentDir = null;
+	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);
+	
+	private void Fill(File f)
+    {
+		File[]dirs = f.listFiles();
+		this.setTitle("Game List");
+		List<GameListItem>dir = new ArrayList<GameListItem>();
+		List<GameListItem>fls = new ArrayList<GameListItem>();
+         
+		try
+		{
+			for(File ff: dirs)
+			{
+				if (ff.getName().charAt(0) != '.')
+					if(!ff.isDirectory())
+	                	if (ff.getName().toLowerCase().contains(".gcm") ||
+	                		ff.getName().toLowerCase().contains(".iso") ||
+	                		ff.getName().toLowerCase().contains(".wbfs") ||
+	                		ff.getName().toLowerCase().contains(".gcz") ||
+	                		ff.getName().toLowerCase().contains(".dol") ||
+	                		ff.getName().toLowerCase().contains(".elf"))
+	                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+             }
+         }
+         catch(Exception e)
+         {
+         }
+         
+         Collections.sort(dir);
+         Collections.sort(fls);
+         dir.addAll(fls);
+         
+         adapter = new GameListAdapter(this,R.layout.main,dir);
+		 this.setListAdapter(adapter);
+    }
+	
+	@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
+		{
+			onFileClick(o.getPath());
+		}
+	}
+	
+	private void onFileClick(String o)
+    {
+    	Toast.makeText(this, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
+    	
+        Intent intent = new Intent();
+        intent.putExtra("Select", o);
+        setResult(Activity.RESULT_OK, intent);
+        
+    	this.finish();
+    }
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		if (resultCode == Activity.RESULT_OK)
+		{
+			String FileName = data.getStringExtra("Select");
+			Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
+			SetConfig("General", "GCMPathes", "1");
+			SetConfig("General", "GCMPaths0", FileName);
+			
+			currentDir = new File(FileName);
+			Fill(currentDir);
+		}
+	}
+	
+	@Override
+	public void onCreate(Bundle savedInstanceState) 
+	{
+		super.onCreate(savedInstanceState);
+		me = this;
+		 
+		mDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
+		 
+		String BrowseDir = GetConfig("General", "GCMPaths0", "");
+		if(currentDir == null)
+			currentDir = new File(BrowseDir);
+		Fill(currentDir);
+		 
+		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
+		dir.add(new SideMenuItem("Browse Folder", 0));
+
+		mList = new ListView(this);
+		mAdapter = new SideMenuAdapter(this,R.layout.sidemenu,dir);
+		mList.setAdapter(mAdapter);
+		mList.setOnItemClickListener(mItemClickListener);
+		
+		mDrawer.setMenuView(mList);
+	}
+    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        	SideMenuItem o = mAdapter.getItem(position);
+        	
+        	switch(o.getID())
+        	{
+        		case 0:
+        			Toast.makeText(me, "Loading up the browser", Toast.LENGTH_SHORT).show();
+        			Intent ListIntent = new Intent(me, FolderBrowser.class);
+        			startActivityForResult(ListIntent, 1);
+        		break;
+        		default:
+        		break;
+        	}
+            mDrawer.closeMenu();
+        }
+    };
+    @Override
+    public void setContentView(int layoutResID) {
+        // This override is only needed when using MENU_DRAG_CONTENT.
+    	mDrawer.setContentView(layoutResID);
+        onContentChanged();
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+            	mDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int drawerState = mDrawer.getDrawerState();
+        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+        	mDrawer.closeMenu();
+            return;
+        }
+
+        super.onBackPressed();
+    }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeListView.java
deleted file mode 100644
index 678d10f035..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeListView.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.Toast;
-
-public class NativeListView extends ListActivity {
-	private FileArrayAdapter adapter;
-	private static File currentDir = null;
-	
-	private void Fill(File f)
-    {
-		File[]dirs = f.listFiles();
-		this.setTitle("Current Dir: " + f.getName());
-		List<Option>dir = new ArrayList<Option>();
-		List<Option>fls = new ArrayList<Option>();
-         
-		try
-		{
-			for(File ff: dirs)
-			{
-				if (ff.getName().charAt(0) != '.')
-					if(ff.isDirectory())
-						dir.add(new Option(ff.getName(),"Folder",ff.getAbsolutePath()));
-					else
-	                	if (ff.getName().toLowerCase().contains(".gcm") ||
-	                		ff.getName().toLowerCase().contains(".iso") ||
-	                		ff.getName().toLowerCase().contains(".wbfs") ||
-	                		ff.getName().toLowerCase().contains(".gcz") ||
-	                		ff.getName().toLowerCase().contains(".dol") ||
-	                		ff.getName().toLowerCase().contains(".elf"))
-	                			fls.add(new Option(ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
-             }
-         }
-         catch(Exception e)
-         {
-         }
-         
-         Collections.sort(dir);
-         Collections.sort(fls);
-         dir.addAll(fls);
-         
-         if(!f.getName().equalsIgnoreCase("sdcard"))
-             dir.add(0,new Option("..","Parent Directory",f.getParent()));
-         adapter = new FileArrayAdapter(this,R.layout.main,dir);
-		 this.setListAdapter(adapter);
-    }
-	
-	@Override
-	protected void onListItemClick(ListView l, View v, int position, long id) {
-		// TODO Auto-generated method stub
-		super.onListItemClick(l, v, position, id);
-		Option o = adapter.getItem(position);
-		if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){
-			currentDir = new File(o.getPath());
-			Fill(currentDir);
-		}
-		else
-		{
-			onFileClick(o.getPath());
-		}
-	}
-	
-	private void onFileClick(String o)
-    {
-    	Toast.makeText(this, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
-    	
-        Intent intent = new Intent();
-        intent.putExtra("Select", o);
-        setResult(Activity.RESULT_OK, intent);
-        
-    	this.finish();
-    }
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) 
-	{
-		 super.onCreate(savedInstanceState);
-		 
-		 if(currentDir == null)
-			 currentDir = new File(Environment.getExternalStorageDirectory().getPath());
-	     Fill(currentDir);
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/Option.java b/Source/Android/src/org/dolphinemu/dolphinemu/Option.java
deleted file mode 100644
index dba6dfd534..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/Option.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-public class Option implements Comparable<Option>{
-    private String name;
-    private String data;
-    private String path;
-    
-    public Option(String n,String d,String p)
-    {
-        name = n;
-        data = d;
-        path = p;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-    
-    public String getData()
-    {
-        return data;
-    }
-    
-    public String getPath()
-    {
-        return path;
-    }
-    
-    public int compareTo(Option 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/SideMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
new file mode 100644
index 0000000000..e1c0ed5e31
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
@@ -0,0 +1,49 @@
+package org.dolphinemu.dolphinemu;
+
+import java.util.List;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+public class SideMenuAdapter extends ArrayAdapter<SideMenuItem>{
+
+	private Context c;
+	private int id;
+	private List<SideMenuItem>items;
+	
+	public SideMenuAdapter(Context context, int textViewResourceId,
+			List<SideMenuItem> objects) {
+		super(context, textViewResourceId, objects);
+		c = context;
+		id = textViewResourceId;
+		items = objects;
+	}
+	public SideMenuItem 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);
+              }
+              final SideMenuItem o = items.get(position);
+              if (o != null) {
+                      TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+                      
+                      if(t1!=null)
+                      	t1.setText(o.getName());
+              }
+              return v;
+      }
+
+
+
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
new file mode 100644
index 0000000000..80f3eaec64
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
@@ -0,0 +1,30 @@
+package org.dolphinemu.dolphinemu;
+
+public class SideMenuItem implements Comparable<SideMenuItem>{
+    private String m_name;
+    private int m_id;
+
+    public SideMenuItem(String n, int id)
+    {
+        m_name = n;
+        m_id = id;
+    }
+    
+    public String getName()
+    {
+        return m_name;
+    }
+    public int getID()
+    {
+    	return m_id;
+    }
+    
+    public int compareTo(SideMenuItem o) 
+    {
+        if(this.m_name != null)
+            return this.m_name.toLowerCase().compareTo(o.getName().toLowerCase()); 
+        else 
+            throw new IllegalArgumentException();
+    }
+}
+
diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp
index 1745517dcc..4d623d5d0b 100644
--- a/Source/Core/DolphinWX/Src/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp
@@ -35,6 +35,11 @@
 #include "BootManager.h"
 #include "OnScreenDisplay.h"
 
+// Banner loading
+#include "Filesystem.h"
+#include "BannerLoader.h"
+#include "VolumeCreator.h"
+
 #include "Android/ButtonManager.h"
 
 #include <jni.h>
@@ -140,6 +145,57 @@ void OSDCallbacks(u32 UserData)
 	}
 }
 
+#define DVD_BANNER_WIDTH 96
+#define DVD_BANNER_HEIGHT 32
+std::vector<std::string> m_volume_names;
+std::vector<std::string> m_names;
+
+bool LoadBanner(std::string filename, u32 *Banner)
+{
+	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
+
+	if (pVolume != NULL)
+	{
+		bool bIsWad = false;
+		if (DiscIO::IsVolumeWadFile(pVolume))
+			bIsWad = true;
+
+		m_volume_names = pVolume->GetNames();
+
+		// check if we can get some info from the banner file too
+		DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
+
+		if (pFileSystem != NULL || bIsWad)
+		{
+			DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume);
+
+			if (pBannerLoader != NULL)
+				if (pBannerLoader->IsValid())
+				{
+					m_names = pBannerLoader->GetNames();
+					if (pBannerLoader->GetBanner(Banner))
+						return true;
+				}
+		}
+	}
+
+	return false;
+}
+std::string GetName(std::string filename)
+{
+	if (!m_names.empty())
+		return m_names[0];
+
+	if (!m_volume_names.empty())
+		return m_volume_names[0];
+	// No usable name, return filename (better than nothing)
+	std::string name;
+	SplitPath(filename, NULL, &name, NULL);
+
+	return name;
+}
+
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -162,6 +218,63 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_DolphinEmulator_onTouchEve
 	ButtonManager::TouchEvent(Action, X, Y);
 }
 
+
+JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
+{
+	const char *File = env->GetStringUTFChars(jFile, NULL);
+	jintArray Banner = env->NewIntArray(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
+	u32 uBanner[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT];
+	if (LoadBanner(File, uBanner))
+	{
+		env->SetIntArrayRegion(Banner, 0, DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT, (jint*)uBanner);
+	}
+	env->ReleaseStringUTFChars(jFile, File);
+	return Banner;
+}
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetTitle(JNIEnv *env, jobject obj, jstring jFile)
+{
+	const char *File = env->GetStringUTFChars(jFile, NULL);
+	std::string Name = GetName(File);
+	m_names.clear();
+	m_volume_names.clear();
+
+	env->ReleaseStringUTFChars(jFile, File);
+	return env->NewStringUTF(Name.c_str());
+}
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListView_GetConfig(JNIEnv *env, jobject obj, jstring jKey, jstring jValue, jstring jDefault)
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	const char *Key = env->GetStringUTFChars(jKey, NULL);
+	const char *Value = env->GetStringUTFChars(jValue, NULL);
+	const char *Default = env->GetStringUTFChars(jDefault, NULL);
+	
+	std::string value;
+	
+	ini.Get(Key, Value, &value, Default);
+
+	env->ReleaseStringUTFChars(jKey, Key);
+	env->ReleaseStringUTFChars(jValue, Value);
+	env->ReleaseStringUTFChars(jDefault, Default);
+
+	return env->NewStringUTF(value.c_str());
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_GameListView_SetConfig(JNIEnv *env, jobject obj, jstring jKey, jstring jValue, jstring jDefault)
+{
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	const char *Key = env->GetStringUTFChars(jKey, NULL);
+	const char *Value = env->GetStringUTFChars(jValue, NULL);
+	const char *Default = env->GetStringUTFChars(jDefault, NULL);
+	
+	ini.Set(Key, Value, Default);
+	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+
+	env->ReleaseStringUTFChars(jKey, Key);
+	env->ReleaseStringUTFChars(jValue, Value);
+	env->ReleaseStringUTFChars(jDefault, Default);
+}
+
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_main(JNIEnv *env, jobject obj, jstring jFile, jobject _surf, jint _width, jint _height)
 {
 	surf = ANativeWindow_fromSurface(env, _surf);
@@ -178,7 +291,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_main(J
 	VideoBackend::PopulateList();
 	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
 	WiimoteReal::LoadSettings();
-	
+
 	const char *File = env->GetStringUTFChars(jFile, NULL);
 	// No use running the loop when booting fails
 	if ( BootManager::BootCore( File ) )