diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml index 2602c8c8f5..5a1ac9c051 100644 --- a/OsmAnd/AndroidManifest-free.xml +++ b/OsmAnd/AndroidManifest-free.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> diff --git a/OsmAnd/AndroidManifest-freedev.xml b/OsmAnd/AndroidManifest-freedev.xml index bc527a3eed..7a5d7dc9cc 100644 --- a/OsmAnd/AndroidManifest-freedev.xml +++ b/OsmAnd/AndroidManifest-freedev.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> @@ -58,8 +58,8 @@ - - + + diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 21d0bbb9f1..91b07adfbc 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.android.application' // Less important android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + 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') diff --git a/OsmAnd/res/drawable-hdpi/icon_free.png b/OsmAnd/res/drawable-hdpi/icon_free.png deleted file mode 100644 index b283fe0b12..0000000000 Binary files a/OsmAnd/res/drawable-hdpi/icon_free.png and /dev/null differ diff --git a/OsmAnd/res/drawable-ldpi/icon.png b/OsmAnd/res/drawable-ldpi/icon.png deleted file mode 100644 index 64550b640a..0000000000 Binary files a/OsmAnd/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/icon.png b/OsmAnd/res/drawable-mdpi/icon.png deleted file mode 100644 index 013c433c4c..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-mdpi/icon_free.png b/OsmAnd/res/drawable-mdpi/icon_free.png deleted file mode 100644 index 208ee44923..0000000000 Binary files a/OsmAnd/res/drawable-mdpi/icon_free.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xhdpi/icon.png b/OsmAnd/res/drawable-xhdpi/icon.png deleted file mode 100644 index 0a195d0742..0000000000 Binary files a/OsmAnd/res/drawable-xhdpi/icon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/icon.png b/OsmAnd/res/drawable-xxhdpi/icon.png deleted file mode 100644 index 79b5a84528..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/icon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxhdpi/icon_free.png b/OsmAnd/res/drawable-xxhdpi/icon_free.png deleted file mode 100644 index 28e9d37c68..0000000000 Binary files a/OsmAnd/res/drawable-xxhdpi/icon_free.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/icon.png b/OsmAnd/res/drawable-xxxhdpi/icon.png deleted file mode 100644 index 5819191503..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/icon.png and /dev/null differ diff --git a/OsmAnd/res/drawable-xxxhdpi/icon_free.png b/OsmAnd/res/drawable-xxxhdpi/icon_free.png deleted file mode 100644 index 9930e64a35..0000000000 Binary files a/OsmAnd/res/drawable-xxxhdpi/icon_free.png and /dev/null differ diff --git a/OsmAnd/res/mipmap-anydpi-v26/icon.xml b/OsmAnd/res/mipmap-anydpi-v26/icon.xml new file mode 100644 index 0000000000..0979b6499b --- /dev/null +++ b/OsmAnd/res/mipmap-anydpi-v26/icon.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/OsmAnd/res/mipmap-hdpi/adaptive_icon_osmand_background.png b/OsmAnd/res/mipmap-hdpi/adaptive_icon_osmand_background.png new file mode 100644 index 0000000000..1446ff69a7 Binary files /dev/null and b/OsmAnd/res/mipmap-hdpi/adaptive_icon_osmand_background.png differ diff --git a/OsmAnd/res/mipmap-hdpi/adaptive_icon_osmand_logo.png b/OsmAnd/res/mipmap-hdpi/adaptive_icon_osmand_logo.png new file mode 100644 index 0000000000..7294e8db2e Binary files /dev/null and b/OsmAnd/res/mipmap-hdpi/adaptive_icon_osmand_logo.png differ diff --git a/OsmAnd/res/drawable-hdpi/icon.png b/OsmAnd/res/mipmap-hdpi/icon.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/icon.png rename to OsmAnd/res/mipmap-hdpi/icon.png diff --git a/OsmAnd/res/drawable-xhdpi/icon_free.png b/OsmAnd/res/mipmap-hdpi/icon_free.png similarity index 100% rename from OsmAnd/res/drawable-xhdpi/icon_free.png rename to OsmAnd/res/mipmap-hdpi/icon_free.png diff --git a/OsmAnd/res/mipmap-ldpi/icon.png b/OsmAnd/res/mipmap-ldpi/icon.png new file mode 100644 index 0000000000..11ec525199 Binary files /dev/null and b/OsmAnd/res/mipmap-ldpi/icon.png differ diff --git a/OsmAnd/res/mipmap-mdpi/adaptive_icon_osmand_background.png b/OsmAnd/res/mipmap-mdpi/adaptive_icon_osmand_background.png new file mode 100644 index 0000000000..a37b0aee72 Binary files /dev/null and b/OsmAnd/res/mipmap-mdpi/adaptive_icon_osmand_background.png differ diff --git a/OsmAnd/res/mipmap-mdpi/adaptive_icon_osmand_logo.png b/OsmAnd/res/mipmap-mdpi/adaptive_icon_osmand_logo.png new file mode 100644 index 0000000000..3ce71db0d6 Binary files /dev/null and b/OsmAnd/res/mipmap-mdpi/adaptive_icon_osmand_logo.png differ diff --git a/OsmAnd/res/mipmap-mdpi/icon.png b/OsmAnd/res/mipmap-mdpi/icon.png new file mode 100644 index 0000000000..11ec525199 Binary files /dev/null and b/OsmAnd/res/mipmap-mdpi/icon.png differ diff --git a/OsmAnd/res/mipmap-mdpi/icon_free.png b/OsmAnd/res/mipmap-mdpi/icon_free.png new file mode 100644 index 0000000000..792cd17d10 Binary files /dev/null and b/OsmAnd/res/mipmap-mdpi/icon_free.png differ diff --git a/OsmAnd/res/mipmap-xhdpi/adaptive_icon_osmand_background.png b/OsmAnd/res/mipmap-xhdpi/adaptive_icon_osmand_background.png new file mode 100644 index 0000000000..758d7f5544 Binary files /dev/null and b/OsmAnd/res/mipmap-xhdpi/adaptive_icon_osmand_background.png differ diff --git a/OsmAnd/res/mipmap-xhdpi/adaptive_icon_osmand_logo.png b/OsmAnd/res/mipmap-xhdpi/adaptive_icon_osmand_logo.png new file mode 100644 index 0000000000..87864d7d3e Binary files /dev/null and b/OsmAnd/res/mipmap-xhdpi/adaptive_icon_osmand_logo.png differ diff --git a/OsmAnd/res/mipmap-xhdpi/icon.png b/OsmAnd/res/mipmap-xhdpi/icon.png new file mode 100644 index 0000000000..11ec525199 Binary files /dev/null and b/OsmAnd/res/mipmap-xhdpi/icon.png differ diff --git a/OsmAnd/res/mipmap-xhdpi/icon_free.png b/OsmAnd/res/mipmap-xhdpi/icon_free.png new file mode 100644 index 0000000000..792cd17d10 Binary files /dev/null and b/OsmAnd/res/mipmap-xhdpi/icon_free.png differ diff --git a/OsmAnd/res/mipmap-xxhdpi/adaptive_icon_osmand_background.png b/OsmAnd/res/mipmap-xxhdpi/adaptive_icon_osmand_background.png new file mode 100644 index 0000000000..569a58b4a7 Binary files /dev/null and b/OsmAnd/res/mipmap-xxhdpi/adaptive_icon_osmand_background.png differ diff --git a/OsmAnd/res/mipmap-xxhdpi/adaptive_icon_osmand_logo.png b/OsmAnd/res/mipmap-xxhdpi/adaptive_icon_osmand_logo.png new file mode 100644 index 0000000000..05c430ea26 Binary files /dev/null and b/OsmAnd/res/mipmap-xxhdpi/adaptive_icon_osmand_logo.png differ diff --git a/OsmAnd/res/mipmap-xxhdpi/icon.png b/OsmAnd/res/mipmap-xxhdpi/icon.png new file mode 100644 index 0000000000..11ec525199 Binary files /dev/null and b/OsmAnd/res/mipmap-xxhdpi/icon.png differ diff --git a/OsmAnd/res/mipmap-xxhdpi/icon_free.png b/OsmAnd/res/mipmap-xxhdpi/icon_free.png new file mode 100644 index 0000000000..792cd17d10 Binary files /dev/null and b/OsmAnd/res/mipmap-xxhdpi/icon_free.png differ diff --git a/OsmAnd/res/mipmap-xxxhdpi/adaptive_icon_osmand_background.png b/OsmAnd/res/mipmap-xxxhdpi/adaptive_icon_osmand_background.png new file mode 100644 index 0000000000..e35b82cbd9 Binary files /dev/null and b/OsmAnd/res/mipmap-xxxhdpi/adaptive_icon_osmand_background.png differ diff --git a/OsmAnd/res/mipmap-xxxhdpi/adaptive_icon_osmand_logo.png b/OsmAnd/res/mipmap-xxxhdpi/adaptive_icon_osmand_logo.png new file mode 100644 index 0000000000..1239657a01 Binary files /dev/null and b/OsmAnd/res/mipmap-xxxhdpi/adaptive_icon_osmand_logo.png differ diff --git a/OsmAnd/res/mipmap-xxxhdpi/icon.png b/OsmAnd/res/mipmap-xxxhdpi/icon.png new file mode 100644 index 0000000000..11ec525199 Binary files /dev/null and b/OsmAnd/res/mipmap-xxxhdpi/icon.png differ diff --git a/OsmAnd/res/mipmap-xxxhdpi/icon_free.png b/OsmAnd/res/mipmap-xxxhdpi/icon_free.png new file mode 100644 index 0000000000..792cd17d10 Binary files /dev/null and b/OsmAnd/res/mipmap-xxxhdpi/icon_free.png differ diff --git a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java index dfc30635c2..15eac5021e 100644 --- a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java +++ b/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); diff --git a/OsmAndCore-sample/build.gradle b/OsmAndCore-sample/build.gradle index 6bfbe775b0..16a775130a 100644 --- a/OsmAndCore-sample/build.gradle +++ b/OsmAndCore-sample/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion "26.0.0" dexOptions { jumboMode true @@ -10,7 +10,7 @@ android { defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 26 versionCode 1 versionName "1.0" } diff --git a/build.gradle b/build.gradle index 82ebb68949..0304d7056b 100644 --- a/build.gradle +++ b/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' } }