diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index 08037ff4f..ad03da6d3 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -20,6 +20,9 @@
+
+
+
diff --git a/assets/resources/application/en_US.xml b/assets/resources/application/en_US.xml
index b7489cf6b..c9596e847 100644
--- a/assets/resources/application/en_US.xml
+++ b/assets/resources/application/en_US.xml
@@ -20,6 +20,9 @@
+
+
+
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index d70e324fe..78e842e9e 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -20,6 +20,9 @@
+
+
+
diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
index 11d56b1be..c74fc8266 100644
--- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
@@ -21,7 +21,7 @@ package org.geometerplus.fbreader.library;
import java.util.*;
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
import org.fbreader.util.Pair;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/LibraryTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/LibraryTree.java
index c882d27ba..31bed701d 100644
--- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/LibraryTree.java
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/LibraryTree.java
@@ -39,6 +39,7 @@ public abstract class LibraryTree extends FBTree {
static final String ROOT_FOUND = "found";
static final String ROOT_FAVORITES = "favorites";
static final String ROOT_RECENT = "recent";
+ static final String ROOT_RECENT_DOWNLOADS = "recentDownloads";
static final String ROOT_BY_AUTHOR = "byAuthor";
static final String ROOT_BY_TITLE = "byTitle";
static final String ROOT_BY_SERIES = "bySeries";
diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RecentDownloadedBooksTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RecentDownloadedBooksTree.java
new file mode 100644
index 000000000..519f99f07
--- /dev/null
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RecentDownloadedBooksTree.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2009-2015 FBReader.ORG Limited
+ *
+ * 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.fbreader.library;
+
+import org.geometerplus.fbreader.book.Book;
+
+public class RecentDownloadedBooksTree extends FirstLevelTree {
+ RecentDownloadedBooksTree(RootTree root) {
+ super(root, ROOT_RECENT_DOWNLOADS);
+ }
+
+ @Override
+ public Status getOpeningStatus() {
+ return Status.ALWAYS_RELOAD_BEFORE_OPENING;
+ }
+
+ @Override
+ public void waitForOpening() {
+ clear();
+ for (Book book : Collection.recentlyAddedBooks(12)) {
+ new BookWithAuthorsTree(this, book);
+ }
+ }
+}
diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RootTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RootTree.java
index ec85bad2a..337af327b 100644
--- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RootTree.java
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/RootTree.java
@@ -33,6 +33,7 @@ public class RootTree extends LibraryTree {
//new ExternalViewTree(this);
new FavoritesTree(this);
new RecentBooksTree(this);
+ new RecentDownloadedBooksTree(this);
new AuthorListTree(this);
new TitleListTree(this);
new SeriesListTree(this);
diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
index 2818531dd..f9b8b7cd4 100644
--- a/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
@@ -26,7 +26,7 @@ import java.util.Map;
import android.annotation.TargetApi;
import android.os.Build;
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
public abstract class TitledEntity> implements Comparable {
private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator();
diff --git a/third-party/AmbilWarna/build.xml b/third-party/AmbilWarna/build.xml
index 86c2b053f..60c702a29 100644
--- a/third-party/AmbilWarna/build.xml
+++ b/third-party/AmbilWarna/build.xml
@@ -4,7 +4,7 @@
-
+
-
+
-
+
-
+
+
+
+
+ Custom pre-compile!
+
+
+
+
+
+
+
diff --git a/third-party/drag-sort-listview/library/project.properties b/third-party/drag-sort-listview/library/project.properties
index e80f2971a..804a5ce56 100644
--- a/third-party/drag-sort-listview/library/project.properties
+++ b/third-party/drag-sort-listview/library/project.properties
@@ -12,4 +12,5 @@
android.library=true
# Project target.
-target=android-5
+target=android-19
+jar.libs.dir=../../../libs
\ No newline at end of file