From f15f35f37c4064886c1f74b00391fc4116627ccb Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Mon, 1 Feb 2016 15:15:29 +0200
Subject: [PATCH 1/6] Removed reference from versionName in manifest.

---
 OsmAnd/AndroidManifest.xml                | 2 +-
 OsmAnd/no_translate.xml                   | 4 ++--
 plugins/Osmand-ParkingPlugin/build.gradle | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index bc259e33b1..e30b699cee 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/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="2.2.4"
 	android:versionCode="231"
 	package="net.osmand.plus">
 
diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index f3881b496b..d7c3d08c32 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="app_name">OsmAnd~</string>
-    <string name="app_version">2.2.0</string>
+    <string name="app_version">2.2.4</string>
     <!--
     Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
              X.X.X#YYYYZ , where
@@ -14,7 +14,7 @@
     <string name="ga_api_key">UA-28342846-2</string>
     <string name="ga_dispatchPeriod">10</string>
     <string name="ga_debug">true</string>
-    <string name="versionFeatures">+play_market -amazon -blackberry</string>
+    <string name="versionFeatures">-play_market -amazon -blackberry</string>
     <string name="next_tips_and_tricks_not_translate"></string>
     <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMap ODbL, &#169; <a href="http://www.openstreetmap.org/copyright">http://www.openstreetmap.org/copyright</a>.
diff --git a/plugins/Osmand-ParkingPlugin/build.gradle b/plugins/Osmand-ParkingPlugin/build.gradle
index 17aa1d99f2..a187392688 100644
--- a/plugins/Osmand-ParkingPlugin/build.gradle
+++ b/plugins/Osmand-ParkingPlugin/build.gradle
@@ -64,4 +64,5 @@ repositories {
 }
 
 dependencies {
+	compile project(":eclipse-compile:appcompat")
 }

From 99940646e3b5907dd18cb3e6a5bbbe328003cfaa Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Thu, 11 Feb 2016 15:09:37 +0200
Subject: [PATCH 2/6] Raster map: synchronized model with view.

---
 OsmAnd/build.gradle | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index fcc943c426..2b4bbc5fa7 100644
--- a/OsmAnd/build.gradle
+++ b/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 {
@@ -184,6 +184,24 @@ task updateNoTranslate(type: Copy) {
 	into 'res/values/'
 }
 
+
+android.applicationVariants.all { variant ->
+	variant.outputs.each { output ->
+		output.processManifest.doLast {
+			replaceInManifest(output,
+					'2.2.4',
+					'14.88')
+
+		}
+	}
+}
+
+def replaceInManifest(output, fromString, toString) {
+	def updatedContent = output.processManifest.manifestOutputFile.getText('UTF-8')
+			.replaceAll(fromString, toString)
+	output.processManifest.manifestOutputFile.write(updatedContent, 'UTF-8')
+}
+
 task validateTranslate {
 	println "Validating translations"
 
@@ -232,7 +250,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"
 	}
 

From 72842b97c3552cc6cb682836f1504e0a8a40dc2c Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Wed, 17 Feb 2016 16:49:46 +0200
Subject: [PATCH 3/6] Uses feature for Famsung

---
 OsmAnd/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index e30b699cee..66c1afd638 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -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"

From 537a21fb331b464c2c297628e55ea91b9dbe35f6 Mon Sep 17 00:00:00 2001
From: Yurii Mazurevich <JMazurevich@gmail.com>
Date: Fri, 19 Feb 2016 12:35:16 +0200
Subject: [PATCH 4/6] Update build.gradle

---
 OsmAnd/build.gradle | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 2b4bbc5fa7..f08c51b78b 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -184,24 +184,6 @@ task updateNoTranslate(type: Copy) {
 	into 'res/values/'
 }
 
-
-android.applicationVariants.all { variant ->
-	variant.outputs.each { output ->
-		output.processManifest.doLast {
-			replaceInManifest(output,
-					'2.2.4',
-					'14.88')
-
-		}
-	}
-}
-
-def replaceInManifest(output, fromString, toString) {
-	def updatedContent = output.processManifest.manifestOutputFile.getText('UTF-8')
-			.replaceAll(fromString, toString)
-	output.processManifest.manifestOutputFile.write(updatedContent, 'UTF-8')
-}
-
 task validateTranslate {
 	println "Validating translations"
 

From b00e8255eacec3f71e109b9a310f8efc577a335b Mon Sep 17 00:00:00 2001
From: Yurii Mazurevich <JMazurevich@gmail.com>
Date: Fri, 19 Feb 2016 12:36:10 +0200
Subject: [PATCH 5/6] Update no_translate.xml

---
 OsmAnd/no_translate.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index d7c3d08c32..f3881b496b 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="app_name">OsmAnd~</string>
-    <string name="app_version">2.2.4</string>
+    <string name="app_version">2.2.0</string>
     <!--
     Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
              X.X.X#YYYYZ , where
@@ -14,7 +14,7 @@
     <string name="ga_api_key">UA-28342846-2</string>
     <string name="ga_dispatchPeriod">10</string>
     <string name="ga_debug">true</string>
-    <string name="versionFeatures">-play_market -amazon -blackberry</string>
+    <string name="versionFeatures">+play_market -amazon -blackberry</string>
     <string name="next_tips_and_tricks_not_translate"></string>
     <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMap ODbL, &#169; <a href="http://www.openstreetmap.org/copyright">http://www.openstreetmap.org/copyright</a>.

From 76640327b6b44476638c7eef5f11b2fa5f1c9e51 Mon Sep 17 00:00:00 2001
From: Yurii Mazurevich <JMazurevich@gmail.com>
Date: Fri, 19 Feb 2016 12:36:48 +0200
Subject: [PATCH 6/6] Update AndroidManifest.xml

---
 OsmAnd/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 66c1afd638..21961e7892 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/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="2.2.4"
+	android:versionName="@string/app_version"
 	android:versionCode="231"
 	package="net.osmand.plus">