Incorporate changes

.gitignore

@@ -1,5 +1,3 @@
-*~
-~*
 .classpath
 .gradle
 .project
@@ -19,3 +17,5 @@ project.properties
 .idea
 build.log
 build-log.xml
+*~
+*.log

CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(android_ros_drivers)
+
+find_package(catkin REQUIRED rosjava_build_tools)
+
+catkin_android_setup(assembleRelease uploadArchives)
+
+catkin_package()
+
+##############################################################################
+# Installation
+##############################################################################
+
+install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/android_ros_drivers/ 
+        DESTINATION ${CATKIN_GLOBAL_MAVEN_DESTINATION}/android_ros_drivers)

README.md

@@ -0,0 +1,32 @@
+# ROS Driver for Android Sensors
+This is a nice android application that allows for publishing of data from a phone to a publish ROS master.
+This can be used to record a ROS bag of data or to preform SLAM on a higher powered computer.
+Note that this only works on phones that use the Camera1 API (so no newer camera2 api phones).
+If you are interested in recording data for a Camera2 API phone check out our other repository [android-dataset-recorder](https://github.com/rpng/android-dataset-recorder).
+Also note that on some phones the number of cameras that you can use is limited (and thus if you select more the app will fail).
+This is caused by a limit to the bandwidth over the camera buses on the physical phone hardware.
+
+
+
+## How to compile and install?
+
+* Downlaod Android Studio and install https://developer.android.com/studio/index.html
+* run `git clone https://github.com/rpng/android_sensors_driver.git android_sensor_project`
+* open android_sensor_porject as existing project in Android Studio
+* Press run button
+* Build will fail but suggest to install missing frameworks. Click on the link, install missing, and press run again.
+* You can choose to run on a simulator or on your phone
+  * Phone
+    * Your phone must have developer mode enabled.
+    * Enter IP of rosmaster
+  * Emulator
+    * IP of localhost of emulator computer is 10.0.0.2
+    * Enter 10.0.0.2 in your app in emulator, if ros is running at your local computer as well
+
+
+## Screenshots
+
+![Screenshot 1](screenshots/Screenshot_2016-01-11-11-53-21.png)
+![Screenshot 2](screenshots/Screenshot_2016-01-11-11-48-04.png)
+![Screenshot 3](screenshots/Screenshot_2017-10-27-12-22-12.png)
+![Screenshot 4](screenshots/Screenshot_2017-10-27-12-25-37.png)

build.gradle

@@ -1,42 +1,59 @@
 /*
- * Copyright (C) 2011 Google Inc.
+ * Copyright (c) 2015, Tal Regev
+ * All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Android Sensors Driver nor the names of its
+ *       contributors may be used to endorse or promote products derived from
+ *       this software without specific prior written permission.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
-
-
-dependencies {
-  compile "org.ros.rosjava_core:rosjava:0.2.0"
-  compile "org.ros.rosjava_core:rosjava_tutorial_pubsub:[0,)"
-  compile 'com.android.support:support-v4:21.0.0'
-  compile project(':android_15')
-
+task wrapper(type: Wrapper) {
+    gradleVersion = "2.14.1"
 }
 
+buildscript {
+    apply from: "https://github.com/rosjava/android_core/raw/kinetic/buildscript.gradle"
+}
 
-apply plugin: 'android'
-
-/*debug.dependsOn project(':android_gingerbread_mr1').tasks.debug*/
+apply plugin: "catkin"
 
-android {
-    compileSdkVersion 15
+allprojects {
+    group "org"
+    version = project.catkin.pkg.version
+}
 
-    defaultConfig {
-        minSdkVersion 15
-        applicationId "org.ros.android.android_sensor_driver"
-        targetSdkVersion 15
-        versionCode 1
-        versionName "1.0"
+subprojects {
+    apply plugin: 'ros-android'
+    afterEvaluate { project ->
+        android {
+            // 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 'jar' , 'assembleRelease', 'uploadArchives'

cv_bridge/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cv_bridge">
+</manifest>
+
+
+<!--<?xml version="1.0" encoding="utf-8"?>-->
+<!--<manifest xmlns:android="http://schemas.android.com/apk/res/android"-->
+<!--package="cv_bridge">-->
+<!--<application-->
+<!--android:icon="@mipmap/ros_icon"-->
+<!--android:label="@string/app_name">-->
+<!--</application>-->
+<!--</manifest>-->

cv_bridge/build.gradle

@@ -0,0 +1,29 @@
+//apply plugin: "ros-android"
+apply plugin: "com.android.library"
+
+dependencies {
+    compile 'org.ros.android_core:android_10:[0.3,0.4)'
+//    compile "org.ros.rosjava_core:rosjava:[0.2,0.3)"
+//    compile "org.ros.rosjava_messages:sensor_msgs:[1.11,1.12)"
+    compile project(':opencv3')
+    compile project(':image')
+}
+
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+    defaultConfig {
+        minSdkVersion 10
+        targetSdkVersion 25
+    }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            res.srcDirs = ['res']
+            aidl.srcDirs = ['src']
+        }
+    }
+}

cv_bridge/res/values/common_strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">cv_bridge for Android</string>
+</resources>