Move teleop code into android_tutorial_teleop package.

Fix duplicate resources.

android_honeycomb_mr2/res/values/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hello">Hello World, Android_honeycombActivity!</string>
-    <string name="app_name">Android_honeycomb</string>
-</resources>

remote_teleop/AndroidManifest.xml → android_tutorial_teleop/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.ros.rosjava.android.tutorials.remote_teleop" android:versionCode="1"
   android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12" />
-  <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+  <uses-sdk android:minSdkVersion="13" android:targetSdkVersion="13" />
+  <uses-permission android:name="android.permission.INTERNET" />
 
   <application android:icon="@drawable/icon" android:label="@string/app_name"
     android:debuggable="true">

android_tutorial_teleop/CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+
+# Set the build type.  Options are:
+#  Coverage       : w/ debug symbols, w/o optimization, w/ code-coverage
+#  Debug          : w/ debug symbols, w/o optimization
+#  Release        : w/o debug symbols, w/ optimization
+#  RelWithDebInfo : w/ debug symbols, w/ optimization
+#  MinSizeRel     : w/o debug symbols, w/ optimization, stripped binaries
+#set(ROS_BUILD_TYPE RelWithDebInfo)
+
+rosbuild_init()
+
+#set the default path for built executables to the "bin" directory
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+#set the default path for built libraries to the "lib" directory
+set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+
+#uncomment if you have defined messages
+#rosbuild_genmsg()
+#uncomment if you have defined services
+#rosbuild_gensrv()
+
+#common commands for building c++ executables and libraries
+#rosbuild_add_library(${PROJECT_NAME} src/example.cpp)
+#target_link_libraries(${PROJECT_NAME} another_library)
+#rosbuild_add_boost_directories()
+#rosbuild_link_boost(${PROJECT_NAME} thread)
+#rosbuild_add_executable(example examples/example.cpp)
+#target_link_libraries(example ${PROJECT_NAME})

android_tutorial_teleop/Makefile

@@ -0,0 +1 @@
+include $(shell rospack find rosjava_bootstrap)/rosjava.mk

android_tutorial_teleop/build.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="." default="compile">
+
+  <property file="ros.properties" />
+  <property file="default.properties" />
+
+  <property name="android.tools.dir" location="${sdk.dir}/tools" />
+
+  <!-- Input directories -->
+  <property name="source.dir" value="src" />
+  <property name="source.absolute.dir" location="${source.dir}" />
+  <property name="gen.dir" value="gen" />
+  <property name="gen.absolute.dir" location="${gen.dir}" />
+  <property name="resource.dir" value="res" />
+  <property name="resource.absolute.dir" location="${resource.dir}" />
+  <property name="asset.dir" value="assets" />
+  <property name="asset.absolute.dir" location="${asset.dir}" />
+
+  <!-- Directory for the third party java libraries -->
+  <property name="external.libs.dir" value="libs" />
+  <property name="external.libs.absolute.dir" location="${external.libs.dir}" />
+
+  <!-- Directory for the native libraries -->
+  <property name="native.libs.dir" value="libs" />
+  <property name="native.libs.absolute.dir" location="${native.libs.dir}" />
+
+  <!-- Output directories -->
+  <property name="out.dir" value="build" />
+  <property name="out.absolute.dir" location="${out.dir}" />
+  <property name="out.classes.dir" value="${out.absolute.dir}/classes" />
+  <property name="out.classes.absolute.dir" location="${out.classes.dir}" />
+
+  <!-- Compilation options -->
+  <property name="java.encoding" value="UTF-8" />
+  <property name="java.target" value="1.6" />
+  <property name="java.source" value="1.6" />
+
+  <path id="android.antlibs">
+    <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+  </path>
+
+  <taskdef name="setup"
+    classname="com.android.ant.SetupTask"
+    classpathref="android.antlibs" />
+
+  <taskdef name="aapt"
+    classname="com.android.ant.AaptExecLoopTask"
+    classpathref="android.antlibs" />
+
+  <taskdef name="xpath"
+    classname="com.android.ant.XPathTask"
+    classpathref="android.antlibs" />
+
+  <taskdef name="if"
+    classname="com.android.ant.IfElseTask"
+    classpathref="android.antlibs" />
+
+  <!-- Name of the application package extracted from manifest file -->
+  <xpath input="AndroidManifest.xml" expression="/manifest/@package"
+    output="manifest.package" />
+  <xpath input="AndroidManifest.xml" expression="/manifest/application/@android:hasCode"
+    output="manifest.hasCode" default="true" />
+
+  <!-- Verbosity -->
+  <property name="verbose" value="false" />
+  <!-- This is needed by emma as it uses multilevel verbosity instead of simple 'true' or 'false'
+         The property 'verbosity' is not user configurable and depends exclusively on 'verbose'
+         value. -->
+  <condition property="verbosity" value="verbose" else="quiet">
+    <istrue value="${verbose}" />
+  </condition>
+
+  <!-- Tools -->
+  <condition property="exe" value=".exe" else=""><os family="windows" /></condition>
+
+  <!-- Emma configuration -->
+  <property name="emma.dir" value="${sdk.dir}/tools/lib" />
+  <path id="emma.lib">
+    <pathelement location="${emma.dir}/emma.jar" />
+    <pathelement location="${emma.dir}/emma_ant.jar" />
+  </path>
+  <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+  <!-- End of emma configuration -->
+
+  <!-- Rules -->
+
+  <!-- Creates the output directories if they don't exist yet. -->
+  <target name="init">
+    <echo>Creating output directories if needed...</echo>
+    <mkdir dir="${resource.absolute.dir}" />
+    <mkdir dir="${external.libs.absolute.dir}" />
+    <mkdir dir="${gen.absolute.dir}" />
+    <mkdir dir="${out.absolute.dir}" />
+    <mkdir dir="${out.classes.absolute.dir}" />
+  </target>
+
+  <!-- Generates the R.java file for this project's resources. -->
+  <target name="resources" depends="init">
+    <echo>Generating R.java / Manifest.java from the resources...</echo>
+    <aapt executable="${aapt}"
+      command="package"
+      verbose="${verbose}"
+      manifest="AndroidManifest.xml"
+      androidjar="${android.jar}"
+      rfolder="${gen.absolute.dir}">
+      <res path="${resource.absolute.dir}" />
+    </aapt>
+  </target>
+
+  <!-- Compiles this project's .java files into .class files. -->
+  <target name="compile" depends="resources"
+    description="Compiles project's .java files into .class files">
+    <javac encoding="${java.encoding}"
+      source="${java.source}" target="${java.target}"
+      debug="true" extdirs=""
+      destdir="${out.classes.absolute.dir}"
+      bootclasspathref="android.target.classpath"
+      verbose="${verbose}"
+      classpath="${extensible.classpath}"
+      classpathref="project.libraries.jars">
+      <src path="${source.absolute.dir}" />
+      <src path="${gen.absolute.dir}" />
+      <src refid="project.libraries.src" />
+      <classpath>
+        <pathelement path="${ros.compile.classpath}" />
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="clean" description="Removes output files created by other targets.">
+    <delete dir="${out.absolute.dir}" verbose="${verbose}" />
+    <delete dir="${gen.absolute.dir}" verbose="${verbose}" />
+  </target>
+
+  <setup import="false" />
+
+</project>

android_tutorial_teleop/mainpage.dox

@@ -0,0 +1,26 @@
+/**
+\mainpage
+\htmlinclude manifest.html
+
+\b android_tutorial_teleop is ... 
+
+<!-- 
+Provide an overview of your package.
+-->
+
+
+\section codeapi Code API
+
+<!--
+Provide links to specific auto-generated API documentation within your
+package that is of particular interest to a reader. Doxygen will
+document pretty much every part of your code, so do your best here to
+point the reader to the actual API.
+
+If your codebase is fairly large or has different sets of APIs, you
+should use the doxygen 'group' tag to keep these APIs together. For
+example, the roscpp documentation has 'libros' group.
+-->
+
+
+*/

android_tutorial_teleop/manifest.xml

@@ -0,0 +1,23 @@
+<package>
+  <description brief="android_tutorial_teleop">
+
+     android_tutorial_teleop
+
+  </description>
+  <author>Damon Kohler</author>
+  <license>BSD</license>
+  <review status="unreviewed" notes=""/>
+  <url>http://ros.org/wiki/android_tutorial_teleop</url>
+
+  <depend package="rosjava" />
+  <depend package="android_gingerbread" />
+  <depend package="android_honeycomb_mr2" />
+
+  <export>
+    <rosjava-android-app target="android-13" />
+    <rosjava-src location="src" />
+    <rosjava-src location="gen" />
+    <rosjava-src location="res" />
+  </export>
+
+</package>

remote_teleop/res/values/strings.xml → android_tutorial_teleop/res/values/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, MainActivity!</string>
     <string name="app_name">Remote Teleoperation Tutorial</string>
 </resources>

remote_teleop/build.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="MainActivity" default="help">
-
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="build.properties" />
-
-    <!-- The default.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
-
-
-    <!-- Required pre-setup import -->
-    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
-
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <setup> task.
-             - customize it to your needs.
-         - Customize the whole script.
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
-             - customize to your needs.
-    -->
-    <setup />
-
-</project>