Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
R2.2samsung
This commit is contained in:
Yurii Mazurevich 2016-02-19 12:38:20 +02:00
commit f42b4c3e47
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/AndroidManifest.xml
View file

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

4
OsmAnd/build.gradle
View file

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

1
plugins/Osmand-ParkingPlugin/build.gradle
View file

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