Merge remote-tracking branch 'origin/master'

OsmAnd/AndroidManifest-free.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:icon="@drawable/icon_free"
+        android:icon="@mipmap/icon_free"
 		android:label="@string/app_name_free"
         tools:replace="android:icon, android:label">
 

OsmAnd/AndroidManifest-freedev.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:icon="@drawable/icon_free"
+        android:icon="@mipmap/icon_free"
         tools:replace="android:icon">
         <service
             android:name="net.osmand.plus.NavigationService"

OsmAnd/AndroidManifest.xml

@@ -48,7 +48,7 @@
 
 	<!-- android:theme="@style/OsmandLightDarkActionBarTheme" -->
 	<application android:allowBackup="true" android:backupAgent="net.osmand.plus.OsmandBackupAgent"
-		android:icon="@drawable/icon" android:label="@string/app_name"
+		android:icon="@mipmap/icon" android:label="@string/app_name"
 		android:name="net.osmand.plus.OsmandApplication" android:configChanges="locale"
 		android:theme="@style/OsmandDarkTheme" android:restoreAnyVersion="true" android:largeHeap="true">
 
@@ -58,8 +58,8 @@
 		<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" android:value="" />
 		<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" android:value="" />
 		<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:resource="@dimen/app_minimumsize_h" android:value="" />
-		<meta-data android:name="com.sec.minimode.icon.portrait.normal" android:resource="@drawable/icon" android:value="" />
+		<meta-data android:name="com.sec.minimode.icon.portrait.normal" android:resource="@mipmap/icon" android:value="" />
-		<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@drawable/icon" android:value="" />
+		<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@mipmap/icon" android:value="" />
         <activity android:name="net.osmand.plus.activities.HelpActivity" />
         <activity android:name="net.osmand.plus.activities.ExitActivity" />
         

OsmAnd/res/mipmap-anydpi-v26/icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/adaptive_icon_osmand_background" />
+    <foreground android:drawable="@mipmap/adaptive_icon_osmand_logo" />
+</adaptive-icon>

OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java

@@ -111,7 +111,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
 		NotificationCompat.Builder notificationBuilder =
 				new NotificationCompat.Builder(ctx)
 						.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-						.setSmallIcon(R.drawable.icon)
+						.setSmallIcon(R.mipmap.icon)
 						.setContentTitle(ctx.getString(R.string.app_name))
 						.setContentText(message)
 						.setGroup(WEAR_ALERT);