Merge branch 'master' into release

Author: arthurbenemann

.gitignore

@@ -0,0 +1,7 @@
+.idea/*
+*.iml
+local.properties
+gradle
+.gradle
+gradlew*
+

ChangeLog.md

@@ -1,3 +1,8 @@
+## Droidplanner v2.1.2
+* Clean-up of Strings.xml (#617)
+* Adds a check for Google Play Services (#639)
+* Adding support for Android Studio, Gradle (#623,#619)
+
 ## Droidplanner v2.1.1
 * Fix Parameters screen issue (#613)
 * Making flight screen mission markers un-draggable (#614)

DroidPlanner/.gitignore

@@ -11,6 +11,7 @@
 # generated files
 bin/
 gen/
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties

DroidPlanner/AndroidManifest.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.droidplanner"
-          android:versionCode="59"
+          android:versionCode="60"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="19" />
 
     <supports-screens
         android:requiresSmallestWidthDp="540"/>

DroidPlanner/FlightDataActivity.iml

@@ -0,0 +1,38 @@
+apply plugin: 'android'
+
+dependencies {
+    compile files('libs/usbseriallibrary.jar')
+    compile 'com.android.support:support-v4:18.0.0'
+    compile 'com.google.android.gms:play-services:4.0.30'
+    compile project(':Mavlink')
+    compile project(':HorizontalVariableListView:HorizontalVariableListView')
+}
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.0.1"
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        // Move the tests to tests/java, tests/res, etc...
+        instrumentTest.setRoot('tests')
+
+        // Move the build types to build-types/<type>
+        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+        // This moves them out of them default location under src/<type>/... which would
+        // conflict with src/ being used by the main source set.
+        // Adding new build types or product flavors should be accompanied
+        // by a similar customization.
+        debug.setRoot('build-types/debug')
+        release.setRoot('build-types/release')
+    }
+}

DroidPlanner/build.gradle

@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library.reference.1=../google-play-services_lib
 android.library.reference.2=../Mavlink
 android.library.reference.3=../HorizontalVariableListView/HorizontalVariableListView