diff options
| -rw-r--r-- | res/layout/chooser_list.xml | 49 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/DirectoryPicker.java | 15 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/PreferencesActivity.java | 4 |
4 files changed, 51 insertions, 18 deletions
diff --git a/res/layout/chooser_list.xml b/res/layout/chooser_list.xml index b66982a..f4b4a12 100644 --- a/res/layout/chooser_list.xml +++ b/res/layout/chooser_list.xml @@ -1,16 +1,33 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > - <ListView android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1"/> - <Button android:text="@string/choose" - android:id="@+id/btnChoose" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - -</LinearLayout> +<?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" >
+
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_weight="1" />
+
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+
+ <Button
+ android:id="@+id/btnParent"
+ android:layout_width="fill_parent"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="@string/open_parent" />
+
+ <Button
+ android:id="@+id/btnChoose"
+ android:layout_weight="1"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/choose" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 298d67e..5781715 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -51,4 +51,5 @@ <string name="prefs_sync">Sync</string>
<string name="prefs_clear_sync_data">Clear sync data</string>
<string name="prefs_clear_sync_data_summary">Removes all remotely stored sync data</string>
+ <string name="open_parent">Open parent</string>
</resources>
\ No newline at end of file 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;
|