Merge branch 'master' into route_merge

OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java

@@ -291,8 +291,14 @@ public class SearchUICore {
 		return null;
 	}
 
-	public <T extends SearchCoreAPI> SearchResultCollection shallowSearch(Class<T> cl,
-																		  String text, final ResultMatcher<SearchResult> matcher) throws IOException {
+	public <T extends SearchCoreAPI> SearchResultCollection shallowSearch(Class<T> cl, String text,
+	                                                                      ResultMatcher<SearchResult> matcher) throws IOException {
+		return shallowSearch(cl, text, matcher, true, true);
+	}
+
+	public <T extends SearchCoreAPI> SearchResultCollection shallowSearch(Class<T> cl, String text,
+	                                                                      final ResultMatcher<SearchResult> matcher,
+	                                                                      boolean resortAll, boolean removeDuplicates) throws IOException {
 		T api = getApiByClass(cl);
 		if (api != null) {
 			if (debugMode) {
@@ -306,7 +312,7 @@ public class SearchUICore {
 
 			SearchResultCollection collection = new SearchResultCollection(
 					sphrase);
-			collection.addSearchResults(rm.getRequestResults(), true, true);
+			collection.addSearchResults(rm.getRequestResults(), resortAll, removeDuplicates);
 			if (debugMode) {
 				LOG.info("Finish shallow search <" + sphrase + "> Results=" + rm.getRequestResults().size());
 			}

OsmAnd-telegram/res/values-be/strings.xml

@@ -255,7 +255,7 @@
     <string name="time_zone">Часавы пояс</string>
     <string name="units_and_formats">Адзінкі вымярэння і фарматы</string>
     <string name="unit_of_length_descr">Змяніць адзінкі вымярэння адлегласці.</string>
-    <string name="unit_of_length">Адзінкі даўжыні</string>
+    <string name="unit_of_length">Адзінкі вымярэння адлегласці</string>
     <string name="unit_of_speed_system_descr">Вызначце адзінку вымярэння хуткасці.</string>
     <string name="unit_of_speed_system">Адзінка вымярэння хуткасці</string>
     <string name="buffer_time_descr">Максімальны час захоўвання пунктаў у буферы</string>

OsmAnd/build.gradle

@@ -52,7 +52,8 @@ android {
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 		// Stops the Gradle plugin’s automatic rasterization of vectors
-		vectorDrawables.generatedDensities = ['hdpi']
+		// vectorDrawables.generatedDensities = ['hdpi']
+		vectorDrawables.useSupportLibrary = true
 	}
 
 	lintOptions {
@@ -84,7 +85,7 @@ android {
 		noCompress "qz"
 		cruncherEnabled = false
 		// Flag notifies aapt to keep the attribute IDs around
-		additionalParameters "--no-version-vectors"
+		// additionalParameters "--no-version-vectors"
 	}
 
 	dexOptions {