[Android] Make the file browser look much more nice and user friendly to use.

This is what it now looks like: http://i.imgur.com/KOZgA1i.png

As usual, if any bugs arise from this rather large change. Please report it so I can fix it.

8 files changed, 69 insertions, 26 deletions

diff --git a/Source/Android/res/drawable-hdpi/ic_menu_file.png b/Source/Android/res/drawable-hdpi/ic_menu_file.png
new file mode 100644
index 0000000000..f204740905
--- /dev/null
+++ b/Source/Android/res/drawable-hdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..6f441b41da
--- /dev/null
+++ b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_file.png b/Source/Android/res/drawable-mdpi/ic_menu_file.png
new file mode 100644
index 0000000000..dee2577897
--- /dev/null
+++ b/Source/Android/res/drawable-mdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..cc81e57f7e
--- /dev/null
+++ b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
new file mode 100644
index 0000000000..85369c338e
--- /dev/null
+++ b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
new file mode 100644
index 0000000000..78500a93c1
--- /dev/null
+++ b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/layout/about_layout.xml b/Source/Android/res/layout/about_layout.xml
new file mode 100644
index 0000000000..7189fd7ce5
--- /dev/null
+++ b/Source/Android/res/layout/about_layout.xml
@@ -0,0 +1,29 @@
+<?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="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                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="Title"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/FolderSubTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:text="Subtitle" />
+
+        </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/folderbrowser.xml
index 82b94e238f..61c6fba1ea 100644
--- a/Source/Android/res/layout/folderbrowser.xml
+++ b/Source/Android/res/layout/folderbrowser.xml
@@ -1,29 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:padding="3dip">
+    
+    <ImageView
+        android:id="@+id/ImageIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="6dip"/>
 
-            <TextView
-                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="Title"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/FolderSubTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dip"
-                android:text="Subtitle" />
-
-        </LinearLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/FolderSubTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="26dip" 
+        
+        android:layout_toRightOf="@id/ImageIcon"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:text="Subtitle" />
+    
+    <TextView
+        android:id="@+id/FolderTitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        
+        android:layout_toRightOf="@id/ImageIcon"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_above="@id/FolderSubTitle"
+        android:layout_alignWithParentIfMissing="true"
+                
+        android:gravity="center_vertical"
+        android:text="Title" />
+	
+</RelativeLayout>