From a09b90874d23cc781ae120590ac99ef0d61c8045 Mon Sep 17 00:00:00 2001
From: Paul Gardiner <paulg.artifex@glidos.net>
Date: Thu, 13 Dec 2012 14:35:28 +0000
Subject: Android: add directory navigation to the file picker

---
 android/res/drawable-ldpi/ic_dir.png      | Bin 0 -> 157 bytes
 android/res/drawable-ldpi/ic_doc.png      | Bin 0 -> 167 bytes
 android/res/drawable-ldpi/ic_updir.png    | Bin 0 -> 268 bytes
 android/res/drawable-mdpi/ic_arrow_up.png | Bin 0 -> 297 bytes
 android/res/drawable-mdpi/ic_dir.png      | Bin 0 -> 165 bytes
 android/res/drawable-mdpi/ic_doc.png      | Bin 0 -> 181 bytes
 android/res/layout/picker_entry.xml       |  32 ++++++++++++++++++++++--------
 7 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 android/res/drawable-ldpi/ic_dir.png
 create mode 100644 android/res/drawable-ldpi/ic_doc.png
 create mode 100644 android/res/drawable-ldpi/ic_updir.png
 create mode 100644 android/res/drawable-mdpi/ic_arrow_up.png
 create mode 100644 android/res/drawable-mdpi/ic_dir.png
 create mode 100644 android/res/drawable-mdpi/ic_doc.png

(limited to 'android/res')

diff --git a/android/res/drawable-ldpi/ic_dir.png b/android/res/drawable-ldpi/ic_dir.png
new file mode 100644
index 00000000..2236f2f8
Binary files /dev/null and b/android/res/drawable-ldpi/ic_dir.png differ
diff --git a/android/res/drawable-ldpi/ic_doc.png b/android/res/drawable-ldpi/ic_doc.png
new file mode 100644
index 00000000..75f29a07
Binary files /dev/null and b/android/res/drawable-ldpi/ic_doc.png differ
diff --git a/android/res/drawable-ldpi/ic_updir.png b/android/res/drawable-ldpi/ic_updir.png
new file mode 100644
index 00000000..b923e429
Binary files /dev/null and b/android/res/drawable-ldpi/ic_updir.png differ
diff --git a/android/res/drawable-mdpi/ic_arrow_up.png b/android/res/drawable-mdpi/ic_arrow_up.png
new file mode 100644
index 00000000..de2726ce
Binary files /dev/null and b/android/res/drawable-mdpi/ic_arrow_up.png differ
diff --git a/android/res/drawable-mdpi/ic_dir.png b/android/res/drawable-mdpi/ic_dir.png
new file mode 100644
index 00000000..e15200c5
Binary files /dev/null and b/android/res/drawable-mdpi/ic_dir.png differ
diff --git a/android/res/drawable-mdpi/ic_doc.png b/android/res/drawable-mdpi/ic_doc.png
new file mode 100644
index 00000000..0d6e9def
Binary files /dev/null and b/android/res/drawable-mdpi/ic_doc.png differ
diff --git a/android/res/layout/picker_entry.xml b/android/res/layout/picker_entry.xml
index 1b7038e6..e4d53a59 100644
--- a/android/res/layout/picker_entry.xml
+++ b/android/res/layout/picker_entry.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	android:paddingTop="8dp"
-	android:paddingBottom="8dp"
-	android:paddingLeft="12dp"
-	android:paddingRight="12dp"
-    android:textAppearance="?android:attr/textAppearanceLarge" >
-</TextView>
+    android:layout_height="wrap_content"
+    android:paddingLeft="8dp" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:contentDescription="@string/link_control" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/icon"
+        android:paddingBottom="8dp"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:paddingTop="8dp"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3