From 2f86f4f4ae180ee64dfb3335d37ef85426acaa89 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 23 Dec 2012 11:09:05 +0100
Subject: Implemented directory navigation

---
 res/layout/directory_chooser.xml | 11 ++++++++---
 res/xml/preferences.xml          |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/layout/directory_chooser.xml b/res/layout/directory_chooser.xml
index cf53962ef..842e5d458 100644
--- a/res/layout/directory_chooser.xml
+++ b/res/layout/directory_chooser.xml
@@ -38,8 +38,8 @@
             android:layout_height="60dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:background="@drawable/borderless_button"
-            android:src="@attr/navigation_up" />
+            android:background="?attr/borderless_button"
+            android:src="?attr/navigation_up" />
 
         <TextView
             android:id="@+id/txtvSelectedFolderLabel"
@@ -56,10 +56,15 @@
 
         <TextView
             android:id="@+id/txtvSelectedFolder"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
             android:layout_below="@id/txtvSelectedFolderLabel"
             android:layout_margin="8dp"
             android:layout_toRightOf="@id/butNavUp"
-            android:ellipsize="middle" />
+            android:ellipsize="start"
+            android:scrollHorizontally="true"
+            android:singleLine="true" />
 
         <View
             android:id="@+id/divider"
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e457fcfe2..ccde3097f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -51,7 +51,7 @@
             android:title="@string/pref_revokeAccess_title" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/other_pref" >
-        <Preference
+        <Preference android:title="@string/choose_data_directory" android:key="prefChooseDataDir"/><Preference
             android:key="prefFlattrThisApp"
             android:summary="@string/pref_flattr_this_app_sum"
             android:title="@string/pref_flattr_this_app_title" >
@@ -60,6 +60,7 @@
             android:key="prefAbout"
             android:title="@string/about_pref" />
         
+        
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3