Merging a few udates required to get android compilation working with the new android studio 1.0.

This originally stemmed (but required some cleanup) of changes recommended in #226.

.gitignore

@@ -17,3 +17,9 @@ project.properties
 .idea
 build.log
 build-log.xml
+/opencv/
+/android_all_sensors_driver/
+/android_camera_driver/
+/android_sensors_driver/
+*~
+*.log

android_10/AndroidManifest.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.ros.android.android_10">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.ros.android.android_10">
+
 
-    <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="10"/>
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -13,14 +12,15 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
-        android:icon="@drawable/icon"
+        android:icon="@mipmap/icon"
         android:label="@string/app_name">
         <activity
-            android:name="MasterChooser"
+            android:name="org.ros.android.MasterChooser"
             android:label="@string/app_name"
             android:launchMode="singleTask"/>
 
-        <service android:name="org.ros.android.NodeMainExecutorService">
+        <service android:name="org.ros.android.NodeMainExecutorService"
+                 tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="org.ros.android.NodeMainExecutorService"/>
             </intent-filter>

android_10/build.gradle

@@ -16,18 +16,17 @@
 
 dependencies {
   compile "org.ros.rosjava_core:rosjava:0.2.0"
-  compile "org.ros.rosjava_messages:diagnostic_msgs:[0,)"
-  compile "org.ros.rosjava_messages:sensor_msgs:[0,)"
+  compile "org.ros.rosjava_messages:diagnostic_msgs:[1.11,1.12)"
+  compile "org.ros.rosjava_messages:sensor_msgs:[1.11,1.12)"
 }
 
-apply plugin: "android-library"
+apply plugin: "com.android.library"
 
 android {
   compileSdkVersion 10
 
   defaultConfig {
     minSdkVersion 10
-    applicationId "org.ros.android.android_10"
     targetSdkVersion 10
     versionCode 1
     versionName "1.0"

android_10/src/org/ros/android/MasterChooser.java

@@ -225,7 +225,7 @@ public class MasterChooser extends Activity {
     }.execute();
   }
 
-  private void toast(final String text) {
+  protected void toast(final String text) {
     runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -292,7 +292,7 @@ public class MasterChooser extends Activity {
    * @return true if the desired activity is install on the device, false
    *         otherwise.
    */
-  private boolean isQRCodeReaderInstalled(Intent intent) {
+  protected boolean isQRCodeReaderInstalled(Intent intent) {
     List<ResolveInfo> list =
         getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
     return (list.size() > 0);

android_10/src/org/ros/android/NodeMainExecutorService.java

@@ -207,7 +207,7 @@ public class NodeMainExecutorService extends Service implements NodeMainExecutor
       Preconditions.checkArgument(intent.hasExtra(EXTRA_NOTIFICATION_TICKER));
       Preconditions.checkArgument(intent.hasExtra(EXTRA_NOTIFICATION_TITLE));
       Notification notification =
-          new Notification(R.drawable.icon, intent.getStringExtra(EXTRA_NOTIFICATION_TICKER),
+          new Notification(R.mipmap.icon, intent.getStringExtra(EXTRA_NOTIFICATION_TICKER),
               System.currentTimeMillis());
       Intent notificationIntent = new Intent(this, NodeMainExecutorService.class);
       notificationIntent.setAction(NodeMainExecutorService.ACTION_SHUTDOWN);

android_10/src/org/ros/android/RosActivity.java

@@ -87,7 +87,7 @@ public abstract class RosActivity extends Activity {
     bindNodeMainExecutorService();
   }
 
-  private void bindNodeMainExecutorService() {
+  protected void bindNodeMainExecutorService() {
     Intent intent = new Intent(this, NodeMainExecutorService.class);
     intent.setAction(NodeMainExecutorService.ACTION_START);
     intent.putExtra(NodeMainExecutorService.EXTRA_NOTIFICATION_TICKER, notificationTicker);
@@ -104,7 +104,7 @@ public abstract class RosActivity extends Activity {
     super.onDestroy();
   }
 
-  private void init() {
+  protected void init() {
     // Run init() in a new thread as a convenience since it often requires
     // network access.
     new AsyncTask<Void, Void, Void>() {

android_15/AndroidManifest.xml

@@ -1,11 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_15">
-  <uses-sdk android:targetSdkVersion="15" android:minSdkVersion="15"/>
-  <!-- 
-    You shouldn't need an application tag for a library, but this is a 
-    workaround to get past a gradle android plugin bug in 0.4.
-    
-    It should disappear in 0.5
-  -->
-  <application/>
-</manifest>
+<manifest package="org.ros.android.android_15"/>

android_15/build.gradle

@@ -16,19 +16,18 @@
 
 dependencies {
   compile 'org.ros.rosjava_core:rosjava_geometry:[0.2,0.3)'
-  compile 'com.android.support:support-v4:[18.0,18.1)'
+  compile 'com.android.support:support-v4:21.0.3'
   compile 'org.ros.rosjava_messages:visualization_msgs:[1.10,1.11)'
   compile project(':android_10')
 }
 
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 15
 
   defaultConfig {
     minSdkVersion 15
-    applicationId "org.ros.android.android_15"
     targetSdkVersion 15
     versionCode 1
     versionName "1.0"

android_acm_serial/AndroidManifest.xml

@@ -1,11 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_acm_serial">
-    <uses-sdk android:targetSdkVersion="15" android:minSdkVersion="15"/>
-    <!--
-      You shouldn't need an application tag for a library, but this is a
-      workaround to get past a gradle android plugin bug in 0.4.
-
-      It should disappear in 0.5
-    -->
-    <application />
-</manifest>
+<manifest package="org.ros.android.android_acm_serial"/>

android_acm_serial/build.gradle

@@ -19,14 +19,13 @@ dependencies {
   compile project(':android_10')
 }
 
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 15
 
   defaultConfig {
     minSdkVersion 15
-    applicationId "org.ros.android.android_acm_serial"
     targetSdkVersion 15
     versionCode 1
     versionName "1.0"

android_benchmarks/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_benchmarks">
-    <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="org.ros.android.android_benchmarks.MainActivity"
             android:label="@string/app_name" >
@@ -19,7 +19,7 @@
         </activity>
         <activity android:name="org.ros.android.MasterChooser" />
 
-        <service android:name="org.ros.android.NodeMainExecutorService" >
+        <service android:name="org.ros.android.NodeMainExecutorService">
             <intent-filter>
                 <action android:name="org.ros.android.NodeMainExecutorService" />
             </intent-filter>

android_benchmarks/build.gradle

@@ -19,7 +19,7 @@ dependencies {
   compile project(':android_10')
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 10

android_tutorial_camera/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_tutorial_camera">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -10,8 +9,9 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="org.ros.android.android_tutorial_camera.MainActivity"
             android:configChanges="orientation|keyboardHidden"

android_tutorial_camera/build.gradle

@@ -18,7 +18,7 @@ dependencies {
   compile project(':android_10')
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 10

android_tutorial_image_transport/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_tutorial_image_transport">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="org.ros.android.android_tutorial_image_transport.MainActivity"
             android:configChanges="keyboardHidden|orientation"

android_tutorial_image_transport/build.gradle

@@ -18,7 +18,7 @@ dependencies {
   compile project(':android_10')
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 10

android_tutorial_image_transport/res/layout/main.xml

@@ -3,7 +3,7 @@
   android:orientation="vertical" android:layout_width="fill_parent"
   android:layout_height="fill_parent">
   <org.ros.android.view.RosImageView
-    android:layout_height="fill_parent" android:src="@drawable/icon"
+    android:layout_height="fill_parent" android:src="@mipmap/icon"
     android:id="@+id/image" android:layout_width="fill_parent">
   </org.ros.android.view.RosImageView>
 </LinearLayout>

android_tutorial_map_viewer/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_tutorial_map_viewer">
-    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="org.ros.android.android_tutorial_map_viewer.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"

android_tutorial_map_viewer/build.gradle

@@ -18,7 +18,7 @@ dependencies {
   compile project(':android_15')
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 15

android_tutorial_pubsub/AndroidManifest.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_tutorial_pubsub">
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="org.ros.android.android_tutorial_pubsub.MainActivity"
             android:label="@string/app_name" >

android_tutorial_pubsub/build.gradle

@@ -19,7 +19,7 @@ dependencies {
   compile project(':android_10')
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 10

android_tutorial_teleop/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.ros.android.android_tutorial_teleop">
-    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="org.ros.android.android_tutorial_teleop.MainActivity"
             android:label="@string/app_name"

android_tutorial_teleop/build.gradle

@@ -18,7 +18,7 @@ dependencies {
   compile project(':android_15')
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 15

build.gradle

@@ -15,46 +15,50 @@
  */
 
 task wrapper(type: Wrapper) {
-  gradleVersion = "1.11"
+    gradleVersion = "2.2.1"
 }
 
 buildscript {
-  apply from: project.file("buildscript.gradle")
+    apply from: project.file("buildscript.gradle")
 }
 
 apply plugin: "catkin"
 
 allprojects {
-  group "org.ros.android_core"
-  version = project.catkin.pkg.version
+    group "org.ros.android_core"
+    version = project.catkin.pkg.version
 }
 
-configure(subprojects.findAll{ it.name.startsWith("android_") }) {
-  apply plugin: "ros-android"
-  afterEvaluate { project ->
-    // Change the layout of Android projects to be compatible with Eclipse.
-    android {
-      sourceSets {
-        main {
-          manifest.srcFile "AndroidManifest.xml"
-          res.srcDirs "res"
-          assets.srcDirs "assets"
-          java.srcDirs "src"
+configure(subprojects.findAll { it.name.startsWith("android_") }) {
+    apply plugin: "ros-android"
+    afterEvaluate { project ->
+        // Change the layout of Android projects to be compatible with Eclipse.
+        android {
+            sourceSets {
+                //noinspection GroovyAssignabilityCheck
+                main {
+                    manifest.srcFile "AndroidManifest.xml"
+                    res.srcDirs "res"
+                    assets.srcDirs "assets"
+                    java.srcDirs "src"
+                }
+            }
+
+            // Copy JAR dependencies into the libs directory for Eclipse.
+            task deployLibs(type: Copy) {
+                from { configurations.compile }
+                into { "${project.projectDir}/libs" }
+            }
+
+            // Exclude a few files that are duplicated across our dependencies and
+            // prevent packaging Android applications.
+            packagingOptions {
+                /* https://github.com/rosjava/android_core/issues/194 */
+                exclude "META-INF/LICENSE.txt"
+                exclude "META-INF/NOTICE.txt"
+            }
         }
-      }
-
-      // Copy JAR dependencies into the libs directory for Eclipse.
-      task deployLibs(type: Copy) {
-        from { configurations.compile }
-        into { "${project.projectDir}/libs" }
-      }
-
-      // Exclude a few files that are duplicated across our dependencies and
-      // prevent packaging Android applications.
-      packagingOptions {
-        exclude "META-INF/LICENSE.txt"
-        exclude "META-INF/NOTICE.txt"
-      }
     }
-  }
 }
+
+defaultTasks 'assembleRelease', 'uploadArchives'

buildscript.gradle

@@ -17,6 +17,6 @@
 rootProject.buildscript {
   apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
   dependencies {
-    classpath "com.android.tools.build:gradle:0.12.+"
+    classpath "com.android.tools.build:gradle:1.0.+"
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Mar 24 12:40:39 CET 2014
+#Thu Feb 19 01:22:22 KST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

package.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <package>
-  <name>android_core</name>
-  <version>0.2.0</version>
-  <description>
-    Android support packages for rosjava.
-  </description>
-  <url type="website">http://ros.org/wiki/android_core</url>
-  <url type="repository">https://github.com/rosjava/android_core</url>
-  <url type="bugtracker">https://github.com/rosjava/android_core/issues</url>
-  <maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
-  <maintainer email="damonkohler@google.com">Damon Kohler</maintainer>
-  <author email="damonkohler@google.com">Damon Kohler</author>
-  <license>Apache 2.0</license>
+    <name>android_core</name>
+    <version>0.2.0</version>
+    <description>
+        Android support packages for rosjava.
+    </description>
+    <url type="website">http://ros.org/wiki/android_core</url>
+    <url type="repository">https://github.com/rosjava/android_core</url>
+    <url type="bugtracker">https://github.com/rosjava/android_core/issues</url>
+    <maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
+    <maintainer email="damonkohler@google.com">Damon Kohler</maintainer>
+    <author email="damonkohler@google.com">Damon Kohler</author>
+    <license>Apache 2.0</license>
 
-  <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>rosjava_build_tools</build_depend>
-  <build_depend>rosjava_core</build_depend>
+    <buildtool_depend>catkin</buildtool_depend>
+    <build_depend>rosjava_build_tools</build_depend>
+    <build_depend>rosjava_core</build_depend>
 </package>