Merge remote-tracking branch 'origin/adaptive_icon'

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/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.android.application'
 // Less important
 
 android {
-	compileSdkVersion 23
+    compileSdkVersion 26
-	buildToolsVersion "23.0.3"
+    buildToolsVersion "26.0.0"
 
 	signingConfigs {
 		development {
@@ -38,7 +38,7 @@ android {
 
 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
-		targetSdkVersion 23
+		targetSdkVersion 26
 		versionCode 270
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		multiDexEnabled true
@@ -352,10 +352,10 @@ tasks.withType(JavaCompile) {
 }
 
 task appStart(type: Exec) {
-	// linux 
+	// linux
 	commandLine 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
 	// windows
-	// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'      
+	// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
 }
 
 repositories {
@@ -373,7 +373,7 @@ repositories {
 	}
 }
 
-def analytics = (System.getenv("APP_FEATURES") && System.getenv("APP_FEATURES").contains("+play_market") && 
+def analytics = (System.getenv("APP_FEATURES") && System.getenv("APP_FEATURES").contains("+play_market") &&
 	System.getenv("PACKAGE_TO_BUILT").equals("net.osmand") ) || System.getenv("USE_FIREBASE")
 dependencies {
 	compile project(path: ':OsmAnd-java', configuration: 'android')

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

@@ -0,0 +1,4 @@
+<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);

OsmAndCore-sample/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 26
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "26.0.0"
 
     dexOptions {
         jumboMode true
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }