allow opening parent directory in directory picker

2 files changed, 17 insertions, 2 deletions

diff --git a/src/org/fox/ttcomics/DirectoryPicker.java b/src/org/fox/ttcomics/DirectoryPicker.java
index 0f401b5..d607b48 100644
--- a/src/org/fox/ttcomics/DirectoryPicker.java
+++ b/src/org/fox/ttcomics/DirectoryPicker.java
@@ -80,6 +80,21 @@ public class DirectoryPicker extends ListActivity {
             }
         });
         
+        Button btnParent = (Button) findViewById(R.id.btnParent);
+        btnParent.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+            	Intent intent = new Intent(DirectoryPicker.this, DirectoryPicker.class);
+                intent.putExtra(DirectoryPicker.START_DIR, dir.getParent());
+                intent.putExtra(DirectoryPicker.SHOW_HIDDEN, showHidden);
+                intent.putExtra(DirectoryPicker.ONLY_DIRS, onlyDirs);
+                startActivityForResult(intent, PICK_DIRECTORY);
+            }
+        });
+        
+        if (dir.getParent() == null) {
+        	btnParent.setVisibility(View.GONE);
+        }
+        
         ListView lv = getListView();
         lv.setTextFilterEnabled(true);
         
diff --git a/src/org/fox/ttcomics/PreferencesActivity.java b/src/org/fox/ttcomics/PreferencesActivity.java
index e6d4cbf..0c4b0ab 100644
--- a/src/org/fox/ttcomics/PreferencesActivity.java
+++ b/src/org/fox/ttcomics/PreferencesActivity.java
@@ -38,8 +38,8 @@ public class PreferencesActivity extends PreferenceActivity {
 			public boolean onPreferenceClick(Preference preference) {

 				Intent intent = new Intent(PreferencesActivity.this, DirectoryPicker.class);

 				

-				//intent.putExtra(DirectoryPicker.START_DIR, prefs.getString("comics_directory", 

-				//		Environment.getExternalStorageDirectory().getAbsolutePath()));

+				intent.putExtra(DirectoryPicker.START_DIR, prefs.getString("comics_directory", 

+						Environment.getExternalStorageDirectory().getAbsolutePath()));

 				

 				startActivityForResult(intent, DirectoryPicker.PICK_DIRECTORY);				

 				return true;