Merge pull request #10303 from osmandapp/master

update test branch

OsmAnd/build.gradle.lib

@@ -344,39 +344,16 @@ project.afterEvaluate {
 		repositories {
 			ivy {
 				url = System.getenv("OSMAND_BINARIES_IVY_ROOT") ?: "./"
+				version = "0.1-SNAPSHOT"
 			}
 		}
 		publications {
 			aar(IvyPublication) {
-				artifact bundleLegacyX86DebugAar {
-					classifier 'legacyX86Debug'
-				}
-				artifact bundleLegacyX86ReleaseAar {
-					classifier 'legacyX86Release'
-				}
-				artifact bundleLegacyArm64DebugAar {
-					classifier 'legacyArm64Debug'
-				}
-				artifact bundleLegacyArm64ReleaseAar {
-					classifier 'legacyArm64Release'
-				}
-				artifact bundleLegacyArmonlyDebugAar {
-					classifier 'legacyArmonlyDebug'
-				}
-				artifact bundleLegacyArmonlyReleaseAar {
-					classifier 'legacyArmonlyRelease'
-				}
-				artifact bundleLegacyArmv7DebugAar {
-					classifier 'legacyArmv7Debug'
-				}
-				artifact bundleLegacyArmv7ReleaseAar {
-					classifier 'legacyArmv7Release'
-				}
 				artifact bundleLegacyFatDebugAar {
-					classifier 'legacyFatDebug'
+					classifier 'debug'
 				}
 				artifact bundleLegacyFatReleaseAar {
-					classifier 'legacyFatRelease'
+					classifier 'release'
 				}
 			}
 		}

OsmAnd/res/drawable/ic_action_folder_add.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C2.8954,4 2,4.8954 2,6V18C2,19.1046 2.8954,20 4,20H12V19C12,15.134 15.134,12 19,12C20.0736,12 21.0907,12.2417 22,12.6736V8C22,6.8954 21.1046,6 20,6H12L10,4H4Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M24,19C24,21.7614 21.7614,24 19,24C16.2386,24 14,21.7614 14,19C14,16.2386 16.2386,14 19,14C21.7614,14 24,16.2386 24,19ZM20,18V16H18V18H16V20H18V22H20V20H22V18H20Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_light_aircraft.xml

@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,3.5001C10.4477,3.5001 10,3.9454 10,4.4977V13.0001C10,18.0001 12,22.0001 12,22.0001C12,22.0001 14,18.0001 14,13.0001V4.4977C14,3.9454 13.5523,3.5001 13,3.5001C12.0781,3.5 11.5,3.5 11,3.5001Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#727272"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M11,12H13C13,12.5523 12.5523,13 12,13C11.4477,13 11,12.5523 11,12Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#727272"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M9.0296,3.7425L11,3.25V3.5H13V3.2501L14.9704,3.7427C15.4934,3.8734 16,3.4778 16,2.9388C16,2.4403 15.5632,2.0547 15.0686,2.1165L12.8001,2.4C12.6177,2.1571 12.3272,2 12,2C11.6729,2 11.3824,2.1571 11.2,2.4L8.9314,2.1164C8.4368,2.0546 8,2.4402 8,2.9386C8,3.4777 8.5066,3.8733 9.0296,3.7425Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M2,7C2,6.4477 2.4477,6 3,6H21C21.5523,6 22,6.4477 22,7V9C22,10.6569 20.6569,12 19,12H5C3.3431,12 2,10.6569 2,9V7Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M9,20H11.2019C11.6263,21.2526 12,22 12,22H9C8.4477,22 8,21.5523 8,21C8,20.4477 8.4477,20 9,20Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M12,22C12,22 12.3737,21.2526 12.7981,20H15C15.5523,20 16,20.4477 16,21C16,21.5523 15.5523,22 15,22H12Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M12,18C11.7239,18 11.5,18.2233 11.5,18.4994V19C11.5,19.5 12,20.5 12,20.5C12,20.5 12.5,19.5 12.5,19V18.4994C12.5,18.2233 12.2761,18 12,18Z"
+      android:fillColor="#727272"/>
+</vector>

OsmAnd/res/values/strings.xml

@@ -11,6 +11,7 @@
 	Thx - Hardy
 
 -->
+    <string name="app_mode_light_aircraft">Light aircraft</string>
     <string name="elevation_data">You can use Elevation data for consideration of Ascent / Descent for your trip</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
     <string name="add_photos_descr">OsmAnd shows photos from several sources:\nOpenPlaceReviews - POI photos;\nMapillary - street-level imagery;\nWeb / Wikimedia - POI photos specified in OpenStreetMap data.</string>

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -328,9 +328,9 @@ public class AndroidUtils {
 						new int[] {}
 				},
 				new int[] {
-						Color.GRAY,
+						ContextCompat.getColor(ctx, night? R.color.text_color_secondary_dark : R.color.text_color_secondary_light),
 						ContextCompat.getColor(ctx, night? R.color.active_color_primary_dark : R.color.active_color_primary_light),
-						Color.GRAY}
+						ContextCompat.getColor(ctx, night? R.color.text_color_secondary_dark : R.color.text_color_secondary_light)}
 		);
 	}
 

OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java

@@ -45,7 +45,8 @@ public enum ProfileIcons {
 	GO_CART(R.drawable.ic_action_go_cart, R.string.app_mode_go_cart, "ic_action_go_cart"),
 	OSM(R.drawable.ic_action_openstreetmap_logo, R.string.app_mode_osm, "ic_action_openstreetmap_logo"),
 	MOTORBOAT(R.drawable.ic_action_motorboat, R.string.app_mode_motorboat, "ic_action_motorboat"),
-	KAYAK(R.drawable.ic_action_kayak, R.string.app_mode_kayak, "ic_action_kayak");
+	KAYAK(R.drawable.ic_action_kayak, R.string.app_mode_kayak, "ic_action_kayak"),
+	LIGHT_AIRCRAFT(R.drawable.ic_action_light_aircraft, R.string.app_mode_light_aircraft, "ic_action_light_aircraft");
 
 	@DrawableRes
 	private int resId;

OsmAnd/src/net/osmand/plus/settings/bottomsheets/ElevationDateBottomSheet.java

@@ -3,6 +3,7 @@ package net.osmand.plus.settings.bottomsheets;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -60,6 +61,8 @@ public class ElevationDateBottomSheet extends MenuBottomSheetDialogFragment {
 	private String on;
 	private String off;
 	private int activeColor;
+	private int checkedColor;
+	private int uncheckedColor;
 	private int disabledColor;
 	private int appModeColor;
 
@@ -95,6 +98,9 @@ public class ElevationDateBottomSheet extends MenuBottomSheetDialogFragment {
 		appModeColor = appMode.getIconColorInfo().getColor(nightMode);
 		activeColor = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic);
 		disabledColor = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorSecondary);
+		checkedColor = (nightMode ? app.getResources().getColor(R.color.text_color_primary_dark) : app.getResources().getColor(R.color.text_color_primary_light));
+		uncheckedColor = (nightMode ? app.getResources().getColor(R.color.text_color_secondary_dark) : app.getResources().getColor(R.color.text_color_secondary_light));
+
 
 		items.add(new TitleItem(getString(R.string.routing_attr_height_obstacles_name)));
 
@@ -213,8 +219,12 @@ public class ElevationDateBottomSheet extends MenuBottomSheetDialogFragment {
 
 	private void enableDisableReliefButtons(boolean enable) {
 		for (BaseBottomSheetItem item : reliefFactorButtons) {
-			item.getView().setEnabled(enable);
-			item.getView().findViewById(R.id.compound_button).setEnabled(enable);
+			View view = item.getView();
+			view.setEnabled(enable);
+			view.findViewById(R.id.compound_button).setEnabled(enable);
+
+			TextView titleField = view.findViewById(R.id.title);
+			titleField.setTextColor(enable ? checkedColor : uncheckedColor);
 		}
 	}
 

OsmAndCore-sample/.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

OsmAndCore-sample/.gitignore

@@ -1,20 +0,0 @@
-# Android Studio
-/.idea
-*.iml
-
-aarDependencies
-libs/android*.jar
-libs/com.*.jar
-libs/net.osmand-*.jar
-gradlew
-gradle
-gradlew.bat
-# Gradle
-.gradle
-/local.properties
-
-# MacOSX
-.DS_Store
-
-# Output
-/build

OsmAndCore-sample/.project

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>OsmAndCore-sample</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

OsmAndCore-sample/AndroidManifest.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.osmand.core.samples.android.sample1" >
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application
-        android:allowBackup="true"
-        android:name=".SampleApplication"
-        android:icon="@mipmap/sample_app"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main"
-            android:configChanges="locale|fontScale|keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-    </application>
-
-</manifest>

OsmAndCore-sample/build.gradle

@@ -1,144 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
-
-    dexOptions {
-        jumboMode true
-    }
-
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-        multiDexEnabled true
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    // This is from OsmAndCore_android.aar - for some reason it's not inherited
-    aaptOptions {
-        // Don't compress any embedded resources
-        noCompress "qz", "png"
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile "AndroidManifest.xml"
-            jni.srcDirs = []
-            jniLibs.srcDirs = ["libs"]
-            java.srcDirs = ["src"]
-            renderscript.srcDirs = ["src"]
-            resources.srcDirs = ["src"]
-            res.srcDirs = ["res"]
-            assets.srcDirs = ["assets"]
-        }
-    }
-
-    flavorDimensions "abi"
-
-    productFlavors {
-        x86 {
-            dimension "abi"
-            ndk {
-                abiFilter "x86"
-            }
-        }
-        arm64 {
-            dimension "abi"
-            ndk {
-                abiFilter 'arm64-v8a'
-            }
-        }
-        armv7 {
-            dimension "abi"
-            ndk {
-                abiFilter "armeabi-v7a"
-            }
-        }
-        fat {
-            dimension "abi"
-			ndk {
-				abiFilters 'arm64-v8a', 'x86', 'armeabi-v7a'
-			}
-        }
-    }
-
-    buildTypes {
-        debug {
-            signingConfig android.signingConfigs.debug
-        }
-        nativeDebug {
-            signingConfig android.signingConfigs.debug
-        }
-        release {
-            signingConfig android.signingConfigs.debug
-        }
-    }
-}
-
-task collectMiscResources(type: Copy) {
-    into "src/net/osmand/osm"
-    from("../../resources/poi") {
-        include "poi_types.xml"
-    }
-}
-
-task collectRegionsInfoResources(type: Copy) {
-    from "../../resources/countries-info"
-    into "src/net/osmand/map"
-    include "regions.ocbf"
-}
-
-task collectRoutingResources(type: Sync) {
-    from "../../resources/routing"
-    into "src/net/osmand/router"
-    include "routing.xml"
-}
-
-tasks.withType(JavaCompile) {
-    compileTask -> compileTask.dependsOn << [collectMiscResources, collectRegionsInfoResources, collectRoutingResources]
-}
-
-repositories {
-    // Local build
-    //flatDir {
-    //    dirs 'libs'
-    //}
-    ivy {
-        name = "OsmAndBinariesIvy"
-        url = "http://builder.osmand.net"
-        layout "pattern" , {
-            artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
-        }
-    }
-    jcenter()
-}
-
-dependencies {
-    implementation project(path: ':OsmAnd-java', configuration: 'android')
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'commons-logging:commons-logging-api:1.1'
-    implementation 'com.moparisthebest:junidecode:0.1.1'
-
-    implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
-
-    implementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-    debugImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
-    nativeDebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
-    releaseImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
-
-    implementation files('libs/QtAndroid.jar')
-    implementation files('libs/QtAndroidBearer.jar')
-
-    // Local build
-    //implementation 'com.vividsolutions:jts-core:1.14.0'
-    //implementation(name: 'OsmAndCore_android-release', ext: 'aar')
-    //implementation(name: 'OsmAndCore_androidNativeRelease-release', ext: 'aar')
-}

OsmAndCore-sample/project.properties

@@ -1,20 +0,0 @@
-target=android-21
-android.library.reference.1=aarDependencies/com.android.support-appcompat-v7-27.1.1
-android.library.reference.2=aarDependencies/com.android.support-support-v4-27.1.1
-android.library.reference.3=aarDependencies/com.android.support-support-compat-27.1.1
-android.library.reference.4=aarDependencies/android.arch.lifecycle-runtime-1.1.0
-android.library.reference.5=aarDependencies/com.android.support-support-core-ui-27.1.1
-android.library.reference.6=aarDependencies/com.android.support-support-core-utils-27.1.1
-android.library.reference.7=aarDependencies/com.android.support-support-fragment-27.1.1
-android.library.reference.8=aarDependencies/com.android.support-support-media-compat-27.1.1
-android.library.reference.9=aarDependencies/com.android.support-support-vector-drawable-27.1.1
-android.library.reference.10=aarDependencies/com.android.support-animated-vector-drawable-27.1.1
-android.library.reference.11=aarDependencies/com.android.support-design-27.1.1
-android.library.reference.12=aarDependencies/com.android.support-transition-27.1.1
-android.library.reference.13=aarDependencies/com.android.support-recyclerview-v7-27.1.1
-android.library.reference.14=aarDependencies/net.osmand-OsmAndCore_android-0.1-SNAPSHOT
-android.library.reference.15=aarDependencies/net.osmand-OsmAndCore_androidNativeRelease-0.1-SNAPSHOT
-android.library.reference.16=aarDependencies/com.android.support-multidex-1.0.1
-android.library.reference.17=aarDependencies/android.arch.lifecycle-viewmodel-1.1.0
-android.library.reference.18=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0
-android.library.reference.19=aarDependencies/android.arch.core-runtime-1.1.0

OsmAndCore-sample/res/anim/slide_in_bottom.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-<translate android:fromYDelta="100%p" android:toYDelta="0"
-           android:duration="@android:integer/config_mediumAnimTime"/>
-<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
-</set>

OsmAndCore-sample/res/anim/slide_in_left.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="-100%p" android:toXDelta="0"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
-           android:duration="@android:integer/config_mediumAnimTime" />
-</set>

OsmAndCore-sample/res/anim/slide_out_bottom.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0" android:toYDelta="100%p"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-           android:duration="@android:integer/config_mediumAnimTime" />
-</set>

OsmAndCore-sample/res/anim/slide_out_left.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0" android:toXDelta="-100%p"
-               android:duration="@android:integer/config_mediumAnimTime"/>
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-           android:duration="@android:integer/config_mediumAnimTime" />
-</set>

OsmAndCore-sample/res/drawable/bg_bottom_menu_light.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <nine-patch android:src="@drawable/bg_contextmenu_shadow_top_light" />
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/bg_color_light" />
-        </shape>
-    </item>
-</layer-list>

OsmAndCore-sample/res/drawable/bg_left_menu_light.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <nine-patch android:src="@drawable/bg_contextmenu_shadow_right_light" />
-    </item>
-    <item>
-        <shape>
-            <solid
-                android:color="@color/bg_color_light" />
-        </shape>
-    </item>
-</layer-list>

OsmAndCore-sample/res/drawable/bg_map_context_menu_light.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <nine-patch android:src="@drawable/bg_contextmenu_dots_light" />
-    </item>
-    <item>
-        <shape>
-            <solid
-                android:color="@color/bg_color_light" />
-        </shape>
-    </item>
-</layer-list>

OsmAndCore-sample/res/drawable/blue_button_drawable.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/blue_button_drawable_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/blue_button_drawable_idle"/>
-</selector>

OsmAndCore-sample/res/drawable/blue_button_drawable_idle.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <corners android:radius="4dp" />
-    <solid android:color="@color/map_widget_blue"/>
-</shape>

OsmAndCore-sample/res/drawable/blue_button_drawable_pressed.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <corners android:radius="4dp" />
-    <solid android:color="@color/map_widget_blue_pressed"/>
-</shape>

OsmAndCore-sample/res/drawable/btn_circle.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/btn_circle_p" android:state_pressed="true"/>
-    <item android:drawable="@drawable/btn_circle_n"></item>
-</selector>

OsmAndCore-sample/res/drawable/btn_circle_n.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <bitmap
-            android:gravity="fill"
-            android:src="@drawable/map_bt_round_1_shadow" />
-    </item>
-    <item>
-        
-        <inset
-            android:insetBottom="2dp"
-            android:insetLeft="2dp"
-            android:insetRight="2dp"
-            android:insetTop="2dp" >
-            <shape android:shape="oval" >
-                <solid android:color="#fff" />
-            </shape>
-        </inset>
-    </item>
-
-</layer-list>

OsmAndCore-sample/res/drawable/btn_circle_p.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <bitmap
-            android:gravity="fill"
-            android:src="@drawable/map_bt_round_1_shadow" />
-    </item>
-    <item>
-        
-        <inset
-            android:insetBottom="2dp"
-            android:insetLeft="2dp"
-            android:insetRight="2dp"
-            android:insetTop="2dp" >
-            <shape android:shape="oval" >
-                <solid android:color="#fff" />
-            </shape>
-        </inset>
-    </item>
-</layer-list>

OsmAndCore-sample/res/drawable/btn_inset_circle_p.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        
-         <bitmap android:src="@drawable/map_bt_round_2_shadow" android:gravity="fill" />
-        
-    </item>  
-    <item>
-        <inset
-            android:insetBottom="@dimen/map_button_inset"
-            android:insetLeft="@dimen/map_button_inset"
-            android:insetRight="@dimen/map_button_inset"
-            android:insetTop="@dimen/map_button_inset" >
-            <shape android:shape="oval" >
-                <solid android:color="@color/map_widget_dark_pressed" />
-            </shape>
-        </inset>
-    </item>
-
-</layer-list>

OsmAndCore-sample/res/drawable/btn_inset_circle_trans.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/btn_inset_circle_p" android:state_pressed="true"/>
-    <item android:drawable="@drawable/btn_inset_circle_trans_n"></item>
-</selector>