[Android] Remove SimonVT menudrawer library. Move to Google's support library for their navigation drawer support. Overall cleanup.

8 files changed, 38 insertions, 30 deletions

diff --git a/Source/Android/res/drawable/ic_drawer.png b/Source/Android/res/drawable/ic_drawer.png
new file mode 100644
index 0000000000..ff7b1def9a
--- /dev/null
+++ b/Source/Android/res/drawable/ic_drawer.png
diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/folderbrowser.xml
index ae480d0807..82b94e238f 100644
--- a/Source/Android/res/layout/folderbrowser.xml
+++ b/Source/Android/res/layout/folderbrowser.xml
@@ -3,42 +3,27 @@
     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:id="@+id/FolderTitle"
                 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:text="Title"
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/TextView02"
+                android:id="@+id/FolderSubTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dip"
-                android:text="@+id/TextView02" />
+                android:text="Subtitle" />
 
         </LinearLayout>
-
-    </LinearLayout>
-
-
-
 </LinearLayout>
diff --git a/Source/Android/res/layout/folderbrowserfooter.xml b/Source/Android/res/layout/folderbrowserfooter.xml
deleted file mode 100644
index 9c0e11d81b..0000000000
--- a/Source/Android/res/layout/folderbrowserfooter.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/gamelist_activity.xml b/Source/Android/res/layout/gamelist_activity.xml
new file mode 100644
index 0000000000..08a2c4eb5b
--- /dev/null
+++ b/Source/Android/res/layout/gamelist_activity.xml
@@ -0,0 +1,20 @@
+<android.support.v4.widget.DrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <FrameLayout
+            android:id="@+id/content_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    <ListView
+            android:id="@+id/left_drawer"
+            android:layout_width="240dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:choiceMode="singleChoice"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="0dp"
+            android:background="#111"/>
+</android.support.v4.widget.DrawerLayout>
diff --git a/Source/Android/res/layout/main.xml b/Source/Android/res/layout/gamelist_layout.xml
index 1b19ad19fe..16596c3cec 100644
--- a/Source/Android/res/layout/main.xml
+++ b/Source/Android/res/layout/gamelist_layout.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content" >
 
         <ImageView
-            android:id="@+id/imageView1"
+            android:id="@+id/GameItemIcon"
             android:layout_width="96dp"
             android:layout_height="match_parent" />
 
@@ -19,7 +19,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:id="@+id/TextView01"
+                android:id="@+id/GameItemTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dip"
@@ -29,7 +29,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/TextView02"
+                android:id="@+id/GameItemSubText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dip"
@@ -40,3 +40,4 @@
     </LinearLayout>
 
 </LinearLayout>
+
diff --git a/Source/Android/res/layout/gamelist_listview.xml b/Source/Android/res/layout/gamelist_listview.xml
new file mode 100644
index 0000000000..265a8f0b36
--- /dev/null
+++ b/Source/Android/res/layout/gamelist_listview.xml
@@ -0,0 +1,7 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gamelist"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:choiceMode="singleChoice"
+    android:divider="@android:color/transparent"
+    android:dividerHeight="0dp"/>
\ No newline at end of file
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
index 57ab67e3ca..76bc937489 100644
--- a/Source/Android/res/layout/sidemenu.xml
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -15,7 +15,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:id="@+id/TextView01"
+                android:id="@+id/SideMenuTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dip"
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 2cfdcb6e7e..40a14e3b4e 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -2,5 +2,7 @@
 <resources>
 
     <string name="app_name">Dolphin Emulator</string>
+    <string name="drawer_open">Open navigation drawer</string>
+    <string name="drawer_close">Close navigation drawer</string>
 
 </resources>