diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-01-23 17:26:13 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-01-24 14:49:31 +0000 |
| commit | 5b8ea84e87614ae026ec48957ff765505006133c (patch) | |
| tree | 013608c0073edbf20f704e5cc54a1109b84c3cb6 | |
| parent | 6cd85db89ff9a95c1d9833a0ec20ddc65adb98c4 (diff) | |
| download | mupdf-5b8ea84e87614ae026ec48957ff765505006133c.tar.xz | |
Android: Show path in file picker title.
Also, replace ".." with "[Up one level]".
| -rw-r--r-- | android/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 826ada55..72794bcc 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -9,7 +9,7 @@ <string name="search_backwards">Search backwards</string> <string name="search_forwards">Search forwards</string> <string name="search_document">Search document</string> - <string name="picker_title">%1$s %2$s</string> + <string name="picker_title">%1$s %2$s: %3$s</string> <string name="outline_title">Table of Contents</string> <string name="enter_password">Enter Password</string> <string name="text_not_found">Text not found</string> diff --git a/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java b/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java index 57e9893b..6f19a063 100644 --- a/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java +++ b/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java @@ -35,12 +35,6 @@ public class ChoosePDFActivity extends ListActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Resources res = getResources(); - String appName = res.getString(R.string.app_name); - String version = res.getString(R.string.version); - String title = res.getString(R.string.picker_title); - setTitle(String.format(title, appName, version)); - String storageState = Environment.getExternalStorageState(); if (!Environment.MEDIA_MOUNTED.equals(storageState) @@ -71,6 +65,12 @@ public class ChoosePDFActivity extends ListActivity { mHandler = new Handler(); mUpdateFiles = new Runnable() { public void run() { + Resources res = getResources(); + String appName = res.getString(R.string.app_name); + String version = res.getString(R.string.version); + String title = res.getString(R.string.picker_title); + setTitle(String.format(title, appName, version, mDirectory)); + mParent = mDirectory.getParentFile(); mDirs = mDirectory.listFiles(new FileFilter() { @@ -114,7 +114,7 @@ public class ChoosePDFActivity extends ListActivity { adapter.clear(); if (mParent != null) - adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.PARENT, "..")); + adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.PARENT, "[Up one level]")); for (File f : mDirs) adapter.add(new ChoosePDFItem(ChoosePDFItem.Type.DIR, f.getName())); for (File f : mFiles) |