Merge branch 'master' into Fix_gpx_select

# Conflicts:
#	OsmAnd/res/layout/gpx_track_item.xml

OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java

@@ -428,7 +428,10 @@ public class BinaryMapIndexReader {
 				if (ls.endsWith("_2")) {
 					ls = ls.substring(0, ls.length() - "_2".length());
 				}
-				return ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+				if (ls.lastIndexOf('_') != -1) {
+					ls = ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+				}
+				return ls;
 			}
 
 		}

OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java

@@ -1011,6 +1011,17 @@ public class RouteDataObject {
 				rf == null ? "" : rf);
 	}
 
+	public boolean hasNameTagStartsWith(String tagStartsWith) {
+		int[] nextSegmentNameIds = nameIds;
+		for (int nm = 0; nm < nameIds.length; nm++) {
+			RouteTypeRule rtr = region.quickGetEncodingRule(nameIds[nm]);
+			if (rtr != null && rtr.getTag().startsWith(tagStartsWith)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public static class RestrictionInfo {
 		public int type;
 		public long toWay;

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/layout/fragment_my_location_tab.xml

@@ -307,8 +307,8 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:background="?attr/selectableItemBackground"
-				android:drawableStart="@drawable/ic_action_undo"
-				android:drawableLeft="@drawable/ic_action_undo"
+				app:drawableLeftCompat="@drawable/ic_action_undo"
+				app:drawableStartCompat="@drawable/ic_action_undo"
 				android:drawablePadding="@dimen/my_location_text_sides_margin"
 				android:gravity="center_vertical"
 				android:minHeight="@dimen/list_item_height_min"
@@ -341,9 +341,9 @@
 			android:layout_height="wrap_content"
 			android:layout_gravity="bottom|center_horizontal"
 			android:background="@drawable/extended_fab_bg"
-			android:drawableLeft="@drawable/ic_action_share_location"
+			app:drawableLeftCompat="@drawable/ic_action_share_location"
+			app:drawableStartCompat="@drawable/ic_action_share_location"
 			android:drawablePadding="@dimen/content_padding_half"
-			android:drawableStart="@drawable/ic_action_share_location"
 			android:gravity="center"
 			android:paddingLeft="32dp"
 			android:paddingRight="32dp"