Merge pull request #2253 from osmandapp/r2.2samsung

R2.2samsung

OsmAnd/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	android:installLocation="auto" 
-	android:versionName="@string/app_version" 
+	android:versionName="@string/app_version"
 	android:versionCode="231"
 	package="net.osmand.plus">
 
@@ -36,6 +36,7 @@
 	<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false" />
 	<uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+	<uses-feature android:name="com.sec.feature.spen_usp" android:required="true"/>
 
 
 	<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"

OsmAnd/build.gradle

@@ -43,7 +43,7 @@ android {
 
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		//versionName already assigned in code
-		//versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
+		versionName System.getenv("APK_VERSION") ? System.getenv("APK_VERSION").toString(): versionName
 	}
 
 	lintOptions {
@@ -232,7 +232,7 @@ task collectHelpContentsAssets(type: Copy) {
 		include "technical-articles.html"
 		include "map-legend.html"
 	}
-	from("../../help/website/feature_articles"){
+	from("../../help/website/feature_articles") {
 		include "*.html"
 	}
 

plugins/Osmand-ParkingPlugin/build.gradle

@@ -64,4 +64,5 @@ repositories {
 }
 
 dependencies {
+	compile project(":eclipse-compile:appcompat")
 }