From 15550abb7eba91e29d52aa6cce46d832b5a51114 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 3 May 2014 14:05:58 +0100 Subject: [PATCH] synchronization with dm branch --- src/org/geometerplus/android/util/FileChooserUtil.java | 4 ++-- .../geometerplus/android/util/FolderListDialogActivity.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/geometerplus/android/util/FileChooserUtil.java b/src/org/geometerplus/android/util/FileChooserUtil.java index e936484bc..2ade3f72f 100644 --- a/src/org/geometerplus/android/util/FileChooserUtil.java +++ b/src/org/geometerplus/android/util/FileChooserUtil.java @@ -39,12 +39,12 @@ public abstract class FileChooserUtil { Activity activity, int requestCode, String title, - String initinalValue, + String initialValue, boolean chooseWritableDirsOnly ) { final Intent intent = new Intent(activity, FileChooserActivity.class); intent.putExtra(FileChooserActivity._TextResources, textResources(title)); - intent.putExtra(FileChooserActivity._Rootpath, (Parcelable)new LocalFile(initinalValue)); + intent.putExtra(FileChooserActivity._Rootpath, (Parcelable)new LocalFile(initialValue)); intent.putExtra(FileChooserActivity._ActionBar, true); intent.putExtra(FileChooserActivity._SaveLastLocation, false); intent.putExtra(FileChooserActivity._DisplayHiddenFiles, true); diff --git a/src/org/geometerplus/android/util/FolderListDialogActivity.java b/src/org/geometerplus/android/util/FolderListDialogActivity.java index 73fceb636..3c9d014a9 100644 --- a/src/org/geometerplus/android/util/FolderListDialogActivity.java +++ b/src/org/geometerplus/android/util/FolderListDialogActivity.java @@ -22,4 +22,10 @@ package org.geometerplus.android.util; import android.app.ListActivity; public class FolderListDialogActivity extends ListActivity { + interface Key { + String FOLDER_LIST = "folder_list.folder_list"; + String ACTIVITY_TITLE = "folder_list.title"; + String CHOOSER_TITLE = "folder_list.chooser_title"; + String WRITABLE_FOLDERS_ONLY = "folder_list.writable_folders_only"; + } }