diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml
index 82e96fa51..a53fff84a 100644
--- a/assets/resources/application/ar.xml
+++ b/assets/resources/application/ar.xml
@@ -349,9 +349,6 @@
-
-
-
diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml
index f4fe69c23..9419f0357 100644
--- a/assets/resources/application/be.xml
+++ b/assets/resources/application/be.xml
@@ -357,9 +357,6 @@
-
-
-
diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml
index a223bf2a5..a8524eede 100644
--- a/assets/resources/application/bg.xml
+++ b/assets/resources/application/bg.xml
@@ -357,9 +357,6 @@
-
-
-
diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml
index 5b79366fc..19e1ee782 100644
--- a/assets/resources/application/ca.xml
+++ b/assets/resources/application/ca.xml
@@ -357,9 +357,6 @@
-
-
-
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index 69ab39fb6..f08acdf85 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -360,9 +360,6 @@
-
-
-
diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml
index 2358828ff..247128a4b 100644
--- a/assets/resources/application/da.xml
+++ b/assets/resources/application/da.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index e81d33bad..05f078191 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -357,9 +357,6 @@
-
-
-
diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml
index 4aea20a7a..b6b378bc8 100644
--- a/assets/resources/application/el.xml
+++ b/assets/resources/application/el.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index 1c0cf0c7e..e33bc91e8 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml
index a0c2d34d9..dbc74724c 100644
--- a/assets/resources/application/es.xml
+++ b/assets/resources/application/es.xml
@@ -356,9 +356,6 @@
-
-
-
diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml
index 022ad7dc9..d33e54514 100644
--- a/assets/resources/application/eu.xml
+++ b/assets/resources/application/eu.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml
index b8ecb9f9d..b36c22ac5 100644
--- a/assets/resources/application/fa.xml
+++ b/assets/resources/application/fa.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index bf4f66165..757a97a32 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -344,9 +344,6 @@
-
-
-
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index 3501a2f71..d283c8c00 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index a0a61573e..f88f93622 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml
index 761c9d0f0..1533e61c9 100644
--- a/assets/resources/application/hy.xml
+++ b/assets/resources/application/hy.xml
@@ -356,9 +356,6 @@
-
-
-
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index 57b997fbc..cbe9bd361 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -342,9 +342,6 @@
-
-
-
diff --git a/assets/resources/application/ja.xml b/assets/resources/application/ja.xml
index 847815d11..1ce947f0f 100644
--- a/assets/resources/application/ja.xml
+++ b/assets/resources/application/ja.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml
index 04007228e..a272e1acc 100644
--- a/assets/resources/application/ka.xml
+++ b/assets/resources/application/ka.xml
@@ -356,9 +356,6 @@
-
-
-
diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml
index acf6ca166..0637c77cc 100644
--- a/assets/resources/application/nb.xml
+++ b/assets/resources/application/nb.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index d8d9a98b4..477168cf8 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml
index e9a7697a7..dadb80434 100644
--- a/assets/resources/application/pl.xml
+++ b/assets/resources/application/pl.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml
index 5317a8319..b5c8f9827 100644
--- a/assets/resources/application/pt.xml
+++ b/assets/resources/application/pt.xml
@@ -353,9 +353,6 @@
-
-
-
diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml
index a7c3e6050..e54e4a66d 100644
--- a/assets/resources/application/ro.xml
+++ b/assets/resources/application/ro.xml
@@ -342,9 +342,6 @@
-
-
-
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index 8bb25ed7f..2f0d2e267 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -356,9 +356,6 @@
-
-
-
diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml
index f0e4aa7d9..4c9635056 100644
--- a/assets/resources/application/sr.xml
+++ b/assets/resources/application/sr.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index 08b0747ba..2f5a43be1 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml
index 146827608..d541a6b71 100644
--- a/assets/resources/application/tr.xml
+++ b/assets/resources/application/tr.xml
@@ -351,9 +351,6 @@
-
-
-
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index 5564f4914..5699a9755 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index b8eec63b6..78de6079d 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index 89d3049e7..f87fb8d90 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml
index 4a9801d59..92d29a86d 100644
--- a/assets/resources/application/zh_TW.xml
+++ b/assets/resources/application/zh_TW.xml
@@ -341,9 +341,6 @@
-
-
-
diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
index da373847a..1cf23de9e 100644
--- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
+++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
@@ -144,10 +144,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
directoriesScreen.addPreference(myChooserCollection.createPreference(
directoriesScreen.Resource, "fontPath", Paths.FontPathOption, fontReloader
));
- final PreferenceSet wallpaperReloader = new PreferenceSet.Reloader();
- directoriesScreen.addPreference(myChooserCollection.createPreference(
- directoriesScreen.Resource, "wallpaperPath", Paths.WallpaperPathOption, wallpaperReloader
- ));
directoriesScreen.addPreference(myChooserCollection.createPreference(
directoriesScreen.Resource, "tempDir", Paths.TempDirectoryOption, null
));
@@ -460,11 +456,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
BACKGROUND_REQUEST_CODE
);
colorsScreen.addPreference(myBackgroundPreference);
- final WallpaperPreference wallpaperPreference = new WallpaperPreference(
- this, profile, colorsScreen.Resource.getResource("background")
- );
- colorsScreen.addPreference(wallpaperPreference);
- wallpaperReloader.add(wallpaperPreference);
colorsScreen.addOption(profile.HighlightingOption, "highlighting");
colorsScreen.addOption(profile.RegularTextOption, "text");
diff --git a/src/org/geometerplus/android/fbreader/preferences/WallpaperPreference.java b/src/org/geometerplus/android/fbreader/preferences/WallpaperPreference.java
deleted file mode 100644
index a279aecd9..000000000
--- a/src/org/geometerplus/android/fbreader/preferences/WallpaperPreference.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2009-2014 Geometer Plus
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-package org.geometerplus.android.fbreader.preferences;
-
-import java.util.*;
-
-import android.content.Context;
-
-import org.geometerplus.zlibrary.core.options.ZLStringOption;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
-
-import org.geometerplus.fbreader.fbreader.WallpapersUtil;
-import org.geometerplus.fbreader.fbreader.options.ColorProfile;
-
-class WallpaperPreference extends ZLStringListPreference implements ReloadablePreference {
- private final ZLStringOption myOption;
-
- WallpaperPreference(Context context, ColorProfile profile, ZLResource resource) {
- super(context, resource);
- myOption = profile.WallpaperOption;
-
- reload();
- }
-
- public void reload() {
- final List predefined = WallpapersUtil.predefinedWallpaperFiles();
- final List external = WallpapersUtil.externalWallpaperFiles();
-
- final int size = 1 + predefined.size() + external.size();
- final String[] values = new String[size];
- final String[] texts = new String[size];
-
- values[0] = "";
- texts[0] = myValuesResource.getResource("solidColor").getValue();
- int index = 1;
- for (ZLFile f : predefined) {
- values[index] = f.getPath();
- final String name = f.getShortName();
- texts[index] = myValuesResource.getResource(
- name.substring(0, name.indexOf("."))
- ).getValue();
- ++index;
- }
- for (ZLFile f : external) {
- values[index] = f.getPath();
- texts[index] = f.getShortName();
- ++index;
- }
- setLists(values, texts);
-
- setInitialValue(myOption.getValue());
- }
-
- @Override
- protected void onDialogClosed(boolean result) {
- super.onDialogClosed(result);
- myOption.setValue(getValue());
- }
-}
diff --git a/src/org/geometerplus/android/fbreader/preferences/background/Chooser.java b/src/org/geometerplus/android/fbreader/preferences/background/Chooser.java
index 4a0ae74c2..77468decf 100644
--- a/src/org/geometerplus/android/fbreader/preferences/background/Chooser.java
+++ b/src/org/geometerplus/android/fbreader/preferences/background/Chooser.java
@@ -33,6 +33,8 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
+import org.geometerplus.fbreader.Paths;
+
import org.geometerplus.android.util.FileChooserUtil;
public class Chooser extends ListActivity implements AdapterView.OnItemClickListener {
@@ -82,10 +84,25 @@ public class Chooser extends ListActivity implements AdapterView.OnItemClickList
startActivityForResult(new Intent(this, PredefinedImages.class), 1);
break;
case 2:
+ {
+ final String initialDir;
+ final String currentValue =
+ getIntent().getStringExtra(BackgroundPreference.VALUE_KEY);
+ if (currentValue != null && currentValue.startsWith("/")) {
+ initialDir = currentValue.substring(0, currentValue.lastIndexOf("/"));
+ } else {
+ final List path = Paths.WallpaperPathOption.getValue();
+ if (path.size() > 0) {
+ initialDir = path.get(0);
+ } else {
+ initialDir = "";
+ }
+ }
FileChooserUtil.runFileChooser(
- this, 2, myResource.getValue(), "", ".+\\.(jpe?g|png)"
+ this, 2, myResource.getValue(), initialDir, ".+\\.(jpe?g|png)"
);
break;
+ }
}
}
diff --git a/src/org/geometerplus/fbreader/fbreader/WallpapersUtil.java b/src/org/geometerplus/fbreader/fbreader/WallpapersUtil.java
index 7177626a3..059f47831 100644
--- a/src/org/geometerplus/fbreader/fbreader/WallpapersUtil.java
+++ b/src/org/geometerplus/fbreader/fbreader/WallpapersUtil.java
@@ -19,23 +19,12 @@
package org.geometerplus.fbreader.fbreader;
-import java.util.ArrayList;
import java.util.List;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
-import org.geometerplus.fbreader.Paths;
-
public abstract class WallpapersUtil {
public static List predefinedWallpaperFiles() {
return ZLFile.createFileByPath("wallpapers").children();
}
-
- public static List externalWallpaperFiles() {
- final List files = new ArrayList();
- for (String dir : Paths.WallpaperPathOption.getValue()) {
- files.addAll(ZLFile.createFileByPath(dir).children());
- }
- return files;
- }
}
diff --git a/third-party/android-filechooser/code/res/drawable-hdpi/afc_folder_disabled.png b/third-party/android-filechooser/code/res/drawable-hdpi/afc_folder_disabled.png
index 90766d7b7..b070b1abe 100644
Binary files a/third-party/android-filechooser/code/res/drawable-hdpi/afc_folder_disabled.png and b/third-party/android-filechooser/code/res/drawable-hdpi/afc_folder_disabled.png differ
diff --git a/third-party/android-filechooser/code/res/drawable-ldpi/afc_folder_disabled.png b/third-party/android-filechooser/code/res/drawable-ldpi/afc_folder_disabled.png
index 6bc42e73b..da7b1a08a 100644
Binary files a/third-party/android-filechooser/code/res/drawable-ldpi/afc_folder_disabled.png and b/third-party/android-filechooser/code/res/drawable-ldpi/afc_folder_disabled.png differ
diff --git a/third-party/android-filechooser/code/res/drawable-mdpi/afc_folder_disabled.png b/third-party/android-filechooser/code/res/drawable-mdpi/afc_folder_disabled.png
index afaccc259..ee4315eae 100644
Binary files a/third-party/android-filechooser/code/res/drawable-mdpi/afc_folder_disabled.png and b/third-party/android-filechooser/code/res/drawable-mdpi/afc_folder_disabled.png differ
diff --git a/third-party/android-filechooser/code/res/drawable-xhdpi/afc_folder_disabled.png b/third-party/android-filechooser/code/res/drawable-xhdpi/afc_folder_disabled.png
index 53b10caae..99e2ce12d 100644
Binary files a/third-party/android-filechooser/code/res/drawable-xhdpi/afc_folder_disabled.png and b/third-party/android-filechooser/code/res/drawable-xhdpi/afc_folder_disabled.png differ