Clean up android project package names.

Flesh out the documentation welcome page.

android_gingerbread/AndroidManifest.xml

@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:versionCode="1"
-  android:versionName="1.0"
-  package="org.ros.android_gingerbread">
-  <uses-sdk android:minSdkVersion="10" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <application
-    android:icon="@drawable/icon"
-    android:label="@string/app_name">
-    <activity
-      android:label="@string/app_name"
-      android:name="MasterChooser"
-      android:launchMode="singleTask" />
-    <service android:name="NodeRunnerService">
-      <intent-filter>
-        <action android:name="org.ros.android.NodeRunnerService" />
-      </intent-filter>
-    </service>
-  </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.ros.android.android_gingerbread"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="10" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name="MasterChooser"
+            android:label="@string/app_name"
+            android:launchMode="singleTask" />
+
+        <service android:name="org.ros.android.NodeMainExecutorService" >
+            <intent-filter>
+                <action android:name="org.ros.android.NodeMainExecutorService" />
+            </intent-filter>
+        </service>
+    </application>
+
+</manifest>

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

@@ -18,8 +18,6 @@ package org.ros.android;
 
 import com.google.common.base.Preconditions;
 
-import org.ros.android_gingerbread.R;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -30,6 +28,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
+import org.ros.android.android_gingerbread.R;
 import org.ros.node.NodeConfiguration;
 
 import java.net.URI;

android_gingerbread/src/org/ros/android/NodeRunnerListener.java → android_gingerbread/src/org/ros/android/NodeMainExecutorListener.java

@@ -21,12 +21,11 @@ import org.ros.node.NodeMainExecutor;
 /**
  * @author damonkohler@google.com (Damon Kohler)
  */
-public interface NodeRunnerListener {
+public interface NodeMainExecutorListener {
 
   /**
    * @param nodeMainExecutor
    *          the newly created {@link NodeMainExecutor}
    */
-  void onNewNodeRunner(NodeMainExecutor nodeMainExecutor);
-
+  void onNewNodeMainExecutor(NodeMainExecutor nodeMainExecutor);
 }

android_gingerbread/src/org/ros/android/NodeRunnerService.java → android_gingerbread/src/org/ros/android/NodeMainExecutorService.java

@@ -18,8 +18,6 @@ package org.ros.android;
 
 import com.google.common.base.Preconditions;
 
-import org.ros.android_gingerbread.R;
-
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -31,6 +29,7 @@ import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
+import org.ros.android.android_gingerbread.R;
 import org.ros.concurrent.ListenerCollection;
 import org.ros.concurrent.ListenerCollection.SignalRunnable;
 import org.ros.node.DefaultNodeMainExecutor;
@@ -45,7 +44,7 @@ import java.util.concurrent.ScheduledExecutorService;
 /**
  * @author damonkohler@google.com (Damon Kohler)
  */
-public class NodeRunnerService extends Service implements NodeMainExecutor {
+public class NodeMainExecutorService extends Service implements NodeMainExecutor {
 
   private static final String TAG = "NodeRunnerService";
 
@@ -59,7 +58,7 @@ public class NodeRunnerService extends Service implements NodeMainExecutor {
 
   private final NodeMainExecutor nodeMainExecutor;
   private final IBinder binder;
-  private final ListenerCollection<NodeRunnerServiceListener> listeners;
+  private final ListenerCollection<NodeMainExecutorServiceListener> listeners;
 
   private WakeLock wakeLock;
   private WifiLock wifiLock;
@@ -69,17 +68,17 @@ public class NodeRunnerService extends Service implements NodeMainExecutor {
    * the same process as its clients, we don't need to deal with IPC.
    */
   class LocalBinder extends Binder {
-    NodeRunnerService getService() {
-      return NodeRunnerService.this;
+    NodeMainExecutorService getService() {
+      return NodeMainExecutorService.this;
     }
   }
 
-  public NodeRunnerService() {
+  public NodeMainExecutorService() {
     super();
     nodeMainExecutor = DefaultNodeMainExecutor.newDefault();
     binder = new LocalBinder();
     listeners =
-        new ListenerCollection<NodeRunnerServiceListener>(
+        new ListenerCollection<NodeMainExecutorServiceListener>(
             nodeMainExecutor.getScheduledExecutorService());
   }
 
@@ -138,15 +137,15 @@ public class NodeRunnerService extends Service implements NodeMainExecutor {
     stopSelf();
   }
 
-  public void addListener(NodeRunnerServiceListener listener) {
+  public void addListener(NodeMainExecutorServiceListener listener) {
     listeners.add(listener);
   }
 
   private void signalOnShutdown() {
-    listeners.signal(new SignalRunnable<NodeRunnerServiceListener>() {
+    listeners.signal(new SignalRunnable<NodeMainExecutorServiceListener>() {
       @Override
-      public void run(NodeRunnerServiceListener nodeRunnerServiceListener) {
-        nodeRunnerServiceListener.onShutdown(NodeRunnerService.this);
+      public void run(NodeMainExecutorServiceListener nodeMainExecutorServiceListener) {
+        nodeMainExecutorServiceListener.onShutdown(NodeMainExecutorService.this);
       }
     });
   }
@@ -169,8 +168,8 @@ public class NodeRunnerService extends Service implements NodeMainExecutor {
           new Notification(R.drawable.icon, intent.getStringExtra(EXTRA_NOTIFICATION_TICKER),
               System.currentTimeMillis());
       // Should this be the RosActivity context instead?
-      Intent notificationIntent = new Intent(this, NodeRunnerService.class);
-      notificationIntent.setAction(NodeRunnerService.ACTION_SHUTDOWN);
+      Intent notificationIntent = new Intent(this, NodeMainExecutorService.class);
+      notificationIntent.setAction(NodeMainExecutorService.ACTION_SHUTDOWN);
       PendingIntent pendingIntent = PendingIntent.getService(this, 0, notificationIntent, 0);
       notification.setLatestEventInfo(this, intent.getStringExtra(EXTRA_NOTIFICATION_TITLE),
           "Tap to shutdown.", pendingIntent);

android_gingerbread/src/org/ros/android/NodeRunnerServiceListener.java → android_gingerbread/src/org/ros/android/NodeMainExecutorServiceListener.java

@@ -20,10 +20,10 @@ package org.ros.android;
 /**
  * @author damonkohler@google.com (Damon Kohler)
  */
-public interface NodeRunnerServiceListener {
+public interface NodeMainExecutorServiceListener {
 
   /**
-   * @param nodeRunnerService the {@link NodeRunnerService} that was shut down
+   * @param nodeMainExecutorService the {@link NodeMainExecutorService} that was shut down
    */
-  void onShutdown(NodeRunnerService nodeRunnerService);
+  void onShutdown(NodeMainExecutorService nodeMainExecutorService);
 }

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

@@ -42,23 +42,23 @@ public abstract class RosActivity extends Activity {
   private final String notificationTitle;
 
   private URI masterUri;
-  private NodeRunnerService nodeRunnerService;
+  private NodeMainExecutorService nodeMainExecutorService;
 
   private class NodeRunnerServiceConnection implements ServiceConnection {
     @Override
     public void onServiceConnected(ComponentName name, IBinder binder) {
-      nodeRunnerService = ((NodeRunnerService.LocalBinder) binder).getService();
-      nodeRunnerService.addListener(new NodeRunnerServiceListener() {
+      nodeMainExecutorService = ((NodeMainExecutorService.LocalBinder) binder).getService();
+      nodeMainExecutorService.addListener(new NodeMainExecutorServiceListener() {
         @Override
-        public void onShutdown(NodeRunnerService nodeRunnerService) {
+        public void onShutdown(NodeMainExecutorService nodeMainExecutorService) {
           RosActivity.this.finish();
         }
       });
       // Run init() in a new thread as a convenience since it often requires
       // network access. Also, this allows us to keep a reference to the
       // NodeMainExecutor separate from this class.
-      nodeRunnerService.getScheduledExecutorService().execute(
-          new InitRunnable(RosActivity.this, nodeRunnerService));
+      nodeMainExecutorService.getScheduledExecutorService().execute(
+          new InitRunnable(RosActivity.this, nodeMainExecutorService));
     }
 
     @Override
@@ -79,7 +79,7 @@ public abstract class RosActivity extends Activity {
       // Call this method on super to avoid triggering our precondition in the
       // overridden startActivityForResult().
       super.startActivityForResult(new Intent(this, MasterChooser.class), 0);
-    } else if (nodeRunnerService == null) {
+    } else if (nodeMainExecutorService == null) {
       // TODO(damonkohler): The NodeRunnerService should maintain its own copy
       // of master URI that we can query if we're restarting this activity.
       startNodeRunnerService();
@@ -88,10 +88,10 @@ public abstract class RosActivity extends Activity {
   }
 
   private void startNodeRunnerService() {
-    Intent intent = new Intent(this, NodeRunnerService.class);
-    intent.setAction(NodeRunnerService.ACTION_START);
-    intent.putExtra(NodeRunnerService.EXTRA_NOTIFICATION_TICKER, notificationTicker);
-    intent.putExtra(NodeRunnerService.EXTRA_NOTIFICATION_TITLE, notificationTitle);
+    Intent intent = new Intent(this, NodeMainExecutorService.class);
+    intent.setAction(NodeMainExecutorService.ACTION_START);
+    intent.putExtra(NodeMainExecutorService.EXTRA_NOTIFICATION_TICKER, notificationTicker);
+    intent.putExtra(NodeMainExecutorService.EXTRA_NOTIFICATION_TITLE, notificationTitle);
     startService(intent);
     Preconditions.checkState(bindService(intent, nodeRunnerServiceConnection, BIND_AUTO_CREATE),
         "Failed to bind NodeRunnerService.");
@@ -99,12 +99,12 @@ public abstract class RosActivity extends Activity {
 
   @Override
   protected void onDestroy() {
-    if (nodeRunnerService != null) {
-      nodeRunnerService.shutdown();
+    if (nodeMainExecutorService != null) {
+      nodeMainExecutorService.shutdown();
       unbindService(nodeRunnerServiceConnection);
       // NOTE(damonkohler): The activity could still be restarted. In that case,
       // nodeRunner needs to be null for everything to be started up again.
-      nodeRunnerService = null;
+      nodeMainExecutorService = null;
     }
     Toast.makeText(this, notificationTitle + " shut down.", Toast.LENGTH_SHORT).show();
     super.onDestroy();
@@ -113,7 +113,7 @@ public abstract class RosActivity extends Activity {
   /**
    * This method is called in a background thread once this {@link Activity} has
    * been initialized with a master {@link URI} via the {@link MasterChooser}
-   * and a {@link NodeRunnerService} has started. Your {@link NodeMain}s should
+   * and a {@link NodeMainExecutorService} has started. Your {@link NodeMain}s should
    * be started here using the provided {@link NodeMainExecutor}.
    * 
    * @param nodeMainExecutor

android_gingerbread/src/org/ros/android/views/CameraPreviewView.java → android_gingerbread/src/org/ros/android/view/CameraPreviewView.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import com.google.common.base.Preconditions;
 

android_gingerbread/src/org/ros/android/views/PublishingPreviewCallback.java → android_gingerbread/src/org/ros/android/view/PublishingPreviewCallback.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import com.google.common.base.Preconditions;
 

android_gingerbread/src/org/ros/android/views/RosCameraPreviewView.java → android_gingerbread/src/org/ros/android/view/RosCameraPreviewView.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

android_gingerbread/src/org/ros/android/views/RosImageView.java → android_gingerbread/src/org/ros/android/view/RosImageView.java

@@ -14,13 +14,14 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
+
+import org.ros.android.MessageCallable;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.widget.ImageView;
-import org.ros.android.MessageCallable;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_gingerbread/src/org/ros/android/views/RosTextView.java → android_gingerbread/src/org/ros/android/view/RosTextView.java

@@ -14,12 +14,13 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
+
+import org.ros.android.MessageCallable;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.TextView;
-import org.ros.android.MessageCallable;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_honeycomb_mr2/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.ros.android_honeycomb_mr2"
+  package="org.ros.android.android_honeycomb_mr2"
   android:versionCode="1"
   android:versionName="1.0">
   <uses-sdk android:minSdkVersion="13" />

android_honeycomb_mr2/src/org/ros/android/views/DistancePoints.java → android_honeycomb_mr2/src/org/ros/android/view/DistancePoints.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

android_honeycomb_mr2/src/org/ros/android/views/DistanceRenderer.java → android_honeycomb_mr2/src/org/ros/android/view/DistanceRenderer.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import android.content.Context;
 import android.content.SharedPreferences;

android_honeycomb_mr2/src/org/ros/android/views/DistanceView.java → android_honeycomb_mr2/src/org/ros/android/view/DistanceView.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import android.content.Context;
 import android.graphics.PixelFormat;

android_honeycomb_mr2/src/org/ros/android/views/PanTiltView.java → android_honeycomb_mr2/src/org/ros/android/view/PanTiltView.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,6 +25,7 @@ import android.view.View;
 import android.view.View.OnTouchListener;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import org.ros.android.android_honeycomb_mr2.R;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;
 import org.ros.node.NodeMain;
@@ -155,7 +156,7 @@ public class PanTiltView extends RelativeLayout implements OnTouchListener, Node
   public PanTiltView(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
     // Instantiate the elements from the layout XML file.
-    LayoutInflater.from(context).inflate(org.ros.android_honeycomb_mr2.R.layout.pan_tilt, this, true);
+    LayoutInflater.from(context).inflate(R.layout.pan_tilt, this, true);
     // Load settings (minPan, maxPan, etc) from the shared preferences.
     loadSettings();
     initPanTiltWidget();
@@ -390,8 +391,8 @@ public class PanTiltView extends RelativeLayout implements OnTouchListener, Node
   }
 
   private void initPanTiltWidget() {
-    mainLayout = (RelativeLayout) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_tilt_layout);
-    desiredTack = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pt_divet);
+    mainLayout = (RelativeLayout) findViewById(R.id.pan_tilt_layout);
+    desiredTack = (ImageView) findViewById(R.id.pt_divet);
     topLargeTack = new ImageView[10];
     topSmallTack = new ImageView[10];
     rightLargeTack = new ImageView[7];
@@ -400,26 +401,26 @@ public class PanTiltView extends RelativeLayout implements OnTouchListener, Node
       topLargeTack[i] = new ImageView(getContext());
       topSmallTack[i] = new ImageView(getContext());
     }
-    topLargeTack[0] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_0);
-    topLargeTack[1] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_1);
-    topLargeTack[2] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_2);
-    topLargeTack[3] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_3);
-    topLargeTack[4] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_4);
-    topLargeTack[5] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_5);
-    topLargeTack[6] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_6);
-    topLargeTack[7] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_7);
-    topLargeTack[8] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_8);
-    topLargeTack[9] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_large_marker_9);
-    topSmallTack[0] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_0);
-    topSmallTack[1] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_1);
-    topSmallTack[2] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_2);
-    topSmallTack[3] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_3);
-    topSmallTack[4] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_4);
-    topSmallTack[5] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_5);
-    topSmallTack[6] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_6);
-    topSmallTack[7] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_7);
-    topSmallTack[8] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_8);
-    topSmallTack[9] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pan_small_marker_9);
+    topLargeTack[0] = (ImageView) findViewById(R.id.pan_large_marker_0);
+    topLargeTack[1] = (ImageView) findViewById(R.id.pan_large_marker_1);
+    topLargeTack[2] = (ImageView) findViewById(R.id.pan_large_marker_2);
+    topLargeTack[3] = (ImageView) findViewById(R.id.pan_large_marker_3);
+    topLargeTack[4] = (ImageView) findViewById(R.id.pan_large_marker_4);
+    topLargeTack[5] = (ImageView) findViewById(R.id.pan_large_marker_5);
+    topLargeTack[6] = (ImageView) findViewById(R.id.pan_large_marker_6);
+    topLargeTack[7] = (ImageView) findViewById(R.id.pan_large_marker_7);
+    topLargeTack[8] = (ImageView) findViewById(R.id.pan_large_marker_8);
+    topLargeTack[9] = (ImageView) findViewById(R.id.pan_large_marker_9);
+    topSmallTack[0] = (ImageView) findViewById(R.id.pan_small_marker_0);
+    topSmallTack[1] = (ImageView) findViewById(R.id.pan_small_marker_1);
+    topSmallTack[2] = (ImageView) findViewById(R.id.pan_small_marker_2);
+    topSmallTack[3] = (ImageView) findViewById(R.id.pan_small_marker_3);
+    topSmallTack[4] = (ImageView) findViewById(R.id.pan_small_marker_4);
+    topSmallTack[5] = (ImageView) findViewById(R.id.pan_small_marker_5);
+    topSmallTack[6] = (ImageView) findViewById(R.id.pan_small_marker_6);
+    topSmallTack[7] = (ImageView) findViewById(R.id.pan_small_marker_7);
+    topSmallTack[8] = (ImageView) findViewById(R.id.pan_small_marker_8);
+    topSmallTack[9] = (ImageView) findViewById(R.id.pan_small_marker_9);
     for (int i = 0; i < topLargeTack.length; i++) {
       topLargeTack[i].setAlpha(0.0f);
       topSmallTack[i].setAlpha(0.0f);
@@ -428,33 +429,33 @@ public class PanTiltView extends RelativeLayout implements OnTouchListener, Node
       rightLargeTack[i] = new ImageView(getContext());
       rightSmallTack[i] = new ImageView(getContext());
     }
-    rightLargeTack[0] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_0);
-    rightLargeTack[1] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_1);
-    rightLargeTack[2] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_2);
-    rightLargeTack[3] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_3);
-    rightLargeTack[4] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_4);
-    rightLargeTack[5] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_5);
-    rightLargeTack[6] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_large_marker_6);
-    rightSmallTack[0] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_0);
-    rightSmallTack[1] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_1);
-    rightSmallTack[2] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_2);
-    rightSmallTack[3] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_3);
-    rightSmallTack[4] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_4);
-    rightSmallTack[5] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_5);
-    rightSmallTack[6] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.tilt_small_marker_6);
+    rightLargeTack[0] = (ImageView) findViewById(R.id.tilt_large_marker_0);
+    rightLargeTack[1] = (ImageView) findViewById(R.id.tilt_large_marker_1);
+    rightLargeTack[2] = (ImageView) findViewById(R.id.tilt_large_marker_2);
+    rightLargeTack[3] = (ImageView) findViewById(R.id.tilt_large_marker_3);
+    rightLargeTack[4] = (ImageView) findViewById(R.id.tilt_large_marker_4);
+    rightLargeTack[5] = (ImageView) findViewById(R.id.tilt_large_marker_5);
+    rightLargeTack[6] = (ImageView) findViewById(R.id.tilt_large_marker_6);
+    rightSmallTack[0] = (ImageView) findViewById(R.id.tilt_small_marker_0);
+    rightSmallTack[1] = (ImageView) findViewById(R.id.tilt_small_marker_1);
+    rightSmallTack[2] = (ImageView) findViewById(R.id.tilt_small_marker_2);
+    rightSmallTack[3] = (ImageView) findViewById(R.id.tilt_small_marker_3);
+    rightSmallTack[4] = (ImageView) findViewById(R.id.tilt_small_marker_4);
+    rightSmallTack[5] = (ImageView) findViewById(R.id.tilt_small_marker_5);
+    rightSmallTack[6] = (ImageView) findViewById(R.id.tilt_small_marker_6);
     for (int i = 0; i < rightLargeTack.length; i++) {
       rightLargeTack[i].setAlpha(0.0f);
       rightSmallTack[i].setAlpha(0.0f);
     }
 
     zoomLitBar = new ImageView[5];
-    zoomLitBar[0] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.zoom_bar_lit_0);
-    zoomLitBar[1] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.zoom_bar_lit_1);
-    zoomLitBar[2] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.zoom_bar_lit_2);
-    zoomLitBar[3] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.zoom_bar_lit_3);
-    zoomLitBar[4] = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.zoom_bar_lit_4);
+    zoomLitBar[0] = (ImageView) findViewById(R.id.zoom_bar_lit_0);
+    zoomLitBar[1] = (ImageView) findViewById(R.id.zoom_bar_lit_1);
+    zoomLitBar[2] = (ImageView) findViewById(R.id.zoom_bar_lit_2);
+    zoomLitBar[3] = (ImageView) findViewById(R.id.zoom_bar_lit_3);
+    zoomLitBar[4] = (ImageView) findViewById(R.id.zoom_bar_lit_4);
 
-    homeIcon = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.pt_home_marker);
+    homeIcon = (ImageView) findViewById(R.id.pt_home_marker);
   }
 
   private void loadSettings() {

android_honeycomb_mr2/src/org/ros/android/views/VirtualJoystickView.java → android_honeycomb_mr2/src/org/ros/android/view/VirtualJoystickView.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 import android.content.Context;
 import android.graphics.Point;
@@ -31,6 +31,7 @@ import android.view.animation.ScaleAnimation;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import org.ros.android.android_honeycomb_mr2.R;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;
@@ -536,62 +537,36 @@ public class VirtualJoystickView extends RelativeLayout implements AnimationList
     // All the virtual joystick elements must be centered on the parent.
     setGravity(Gravity.CENTER);
     // Instantiate the elements from the layout XML file.
-    LayoutInflater.from(context).inflate(org.ros.android_honeycomb_mr2.R.layout.virtual_joystick,
-        this, true);
-    mainLayout =
-        (RelativeLayout) findViewById(org.ros.android_honeycomb_mr2.R.id.virtual_joystick_layout);
-    magnitudeText = (TextView) findViewById(org.ros.android_honeycomb_mr2.R.id.magnitude);
-    intensity = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.intensity);
-    thumbDivet = (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.thumb_divet);
+    LayoutInflater.from(context).inflate(R.layout.virtual_joystick, this, true);
+    mainLayout = (RelativeLayout) findViewById(R.id.virtual_joystick_layout);
+    magnitudeText = (TextView) findViewById(R.id.magnitude);
+    intensity = (ImageView) findViewById(R.id.intensity);
+    thumbDivet = (ImageView) findViewById(R.id.thumb_divet);
     orientationWidget = new ImageView[24];
-    orientationWidget[0] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_0_degrees);
-    orientationWidget[1] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_15_degrees);
-    orientationWidget[2] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_30_degrees);
-    orientationWidget[3] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_45_degrees);
-    orientationWidget[4] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_60_degrees);
-    orientationWidget[5] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_75_degrees);
-    orientationWidget[6] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_90_degrees);
-    orientationWidget[7] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_105_degrees);
-    orientationWidget[8] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_120_degrees);
-    orientationWidget[9] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_135_degrees);
-    orientationWidget[10] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_150_degrees);
-    orientationWidget[11] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_165_degrees);
-    orientationWidget[12] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_180_degrees);
-    orientationWidget[13] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_195_degrees);
-    orientationWidget[14] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_210_degrees);
-    orientationWidget[15] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_225_degrees);
-    orientationWidget[16] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_240_degrees);
-    orientationWidget[17] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_255_degrees);
-    orientationWidget[18] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_270_degrees);
-    orientationWidget[19] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_285_degrees);
-    orientationWidget[20] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_300_degrees);
-    orientationWidget[21] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_315_degrees);
-    orientationWidget[22] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_330_degrees);
-    orientationWidget[23] =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.widget_345_degrees);
+    orientationWidget[0] = (ImageView) findViewById(R.id.widget_0_degrees);
+    orientationWidget[1] = (ImageView) findViewById(R.id.widget_15_degrees);
+    orientationWidget[2] = (ImageView) findViewById(R.id.widget_30_degrees);
+    orientationWidget[3] = (ImageView) findViewById(R.id.widget_45_degrees);
+    orientationWidget[4] = (ImageView) findViewById(R.id.widget_60_degrees);
+    orientationWidget[5] = (ImageView) findViewById(R.id.widget_75_degrees);
+    orientationWidget[6] = (ImageView) findViewById(R.id.widget_90_degrees);
+    orientationWidget[7] = (ImageView) findViewById(R.id.widget_105_degrees);
+    orientationWidget[8] = (ImageView) findViewById(R.id.widget_120_degrees);
+    orientationWidget[9] = (ImageView) findViewById(R.id.widget_135_degrees);
+    orientationWidget[10] = (ImageView) findViewById(R.id.widget_150_degrees);
+    orientationWidget[11] = (ImageView) findViewById(R.id.widget_165_degrees);
+    orientationWidget[12] = (ImageView) findViewById(R.id.widget_180_degrees);
+    orientationWidget[13] = (ImageView) findViewById(R.id.widget_195_degrees);
+    orientationWidget[14] = (ImageView) findViewById(R.id.widget_210_degrees);
+    orientationWidget[15] = (ImageView) findViewById(R.id.widget_225_degrees);
+    orientationWidget[16] = (ImageView) findViewById(R.id.widget_240_degrees);
+    orientationWidget[17] = (ImageView) findViewById(R.id.widget_255_degrees);
+    orientationWidget[18] = (ImageView) findViewById(R.id.widget_270_degrees);
+    orientationWidget[19] = (ImageView) findViewById(R.id.widget_285_degrees);
+    orientationWidget[20] = (ImageView) findViewById(R.id.widget_300_degrees);
+    orientationWidget[21] = (ImageView) findViewById(R.id.widget_315_degrees);
+    orientationWidget[22] = (ImageView) findViewById(R.id.widget_330_degrees);
+    orientationWidget[23] = (ImageView) findViewById(R.id.widget_345_degrees);
     // Initially hide all the widgets.
     for (ImageView tack : orientationWidget) {
       tack.setAlpha(0.0f);
@@ -607,15 +582,12 @@ public class VirtualJoystickView extends RelativeLayout implements AnimationList
     // Initially the orientationWidgets should point to 0 degrees.
     contactTheta = 0;
     animateOrientationWidgets();
-    currentRotationRange =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.top_angle_slice);
-    previousRotationRange =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.mid_angle_slice);
+    currentRotationRange = (ImageView) findViewById(R.id.top_angle_slice);
+    previousRotationRange = (ImageView) findViewById(R.id.mid_angle_slice);
     // Hide the slices/arcs used during the turn-in-place mode.
     currentRotationRange.setAlpha(0.0f);
     previousRotationRange.setAlpha(0.0f);
-    lastVelocityDivet =
-        (ImageView) findViewById(org.ros.android_honeycomb_mr2.R.id.previous_velocity_divet);
+    lastVelocityDivet = (ImageView) findViewById(R.id.previous_velocity_divet);
     contactUpLocation = new Point(0, 0);
     holonomic = false;
     for (ImageView tack : orientationWidget) {

android_honeycomb_mr2/src/org/ros/android/views/ZoomMode.java → android_honeycomb_mr2/src/org/ros/android/view/ZoomMode.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views;
+package org.ros.android.view;
 
 /**
  * @author munjaldesai@google.com (Munjal Desai)

android_honeycomb_mr2/src/org/ros/android/views/visualization/Camera.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/Camera.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import com.google.common.base.Preconditions;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/OpenGlDrawable.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/OpenGlDrawable.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import javax.microedition.khronos.opengles.GL10;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/OpenGlTransform.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/OpenGlTransform.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import org.ros.rosjava_geometry.Transform;
 import org.ros.rosjava_geometry.Vector3;

android_honeycomb_mr2/src/org/ros/android/views/visualization/RenderRequestListener.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/RenderRequestListener.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 /**
  * Interface for handling render requests.

android_honeycomb_mr2/src/org/ros/android/views/visualization/Texture.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/Texture.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import com.google.common.base.Preconditions;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/TextureBitmapUtilities.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/TextureBitmapUtilities.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import com.google.common.base.Preconditions;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/TextureDrawable.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/TextureDrawable.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import com.google.common.base.Preconditions;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/TextureNotInitialized.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/TextureNotInitialized.java

@@ -1,4 +1,4 @@
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 @SuppressWarnings("serial")
 public class TextureNotInitialized extends Exception {

android_honeycomb_mr2/src/org/ros/android/views/visualization/TransformListener.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/TransformListener.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;

android_honeycomb_mr2/src/org/ros/android/views/visualization/Vertices.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/Vertices.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

android_honeycomb_mr2/src/org/ros/android/views/visualization/Viewport.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/Viewport.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import com.google.common.base.Preconditions;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/VisualizationView.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/VisualizationView.java

@@ -14,17 +14,20 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import org.ros.android.view.visualization.layer.Layer;
+
+
+
 import android.content.Context;
 import android.graphics.PixelFormat;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import org.ros.android.views.visualization.layer.Layer;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;
 import org.ros.node.NodeMain;

android_honeycomb_mr2/src/org/ros/android/views/visualization/XYOrthographicRenderer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/XYOrthographicRenderer.java

@@ -14,11 +14,12 @@
  * the License.
  */
 
-package org.ros.android.views.visualization;
+package org.ros.android.view.visualization;
+
+import org.ros.android.view.visualization.layer.Layer;
+import org.ros.android.view.visualization.layer.TfLayer;
 
 import android.opengl.GLSurfaceView;
-import org.ros.android.views.visualization.layer.Layer;
-import org.ros.android.views.visualization.layer.TfLayer;
 import org.ros.namespace.GraphName;
 import org.ros.rosjava_geometry.FrameTransformTree;
 import org.ros.rosjava_geometry.Transform;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/CameraControlLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/CameraControlLayer.java

@@ -14,15 +14,16 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.VisualizationView;
 
 import android.content.Context;
 import android.os.Handler;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.VisualizationView;
 import org.ros.node.Node;
 import org.ros.rosjava_geometry.FrameTransformTree;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/CompressedBitmapLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/CompressedBitmapLayer.java

@@ -14,15 +14,16 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.TextureBitmapUtilities;
+import org.ros.android.view.visualization.TextureDrawable;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Handler;
 import android.util.Log;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.TextureBitmapUtilities;
-import org.ros.android.views.visualization.TextureDrawable;
 import org.ros.collections.PrimitiveArrays;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/DefaultLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/DefaultLayer.java

@@ -14,17 +14,20 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
 
 import com.google.common.collect.Lists;
 
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.RenderRequestListener;
+import org.ros.android.view.visualization.VisualizationView;
+
+
+
 import org.ros.rosjava_geometry.FrameTransformTree;
 
 import android.os.Handler;
 import android.view.MotionEvent;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.RenderRequestListener;
-import org.ros.android.views.visualization.VisualizationView;
 import org.ros.node.Node;
 
 import java.util.Collection;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/GridCellsLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/GridCellsLayer.java

@@ -14,12 +14,14 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.Vertices;
+import org.ros.android.view.visualization.shape.Color;
+
 
 import android.os.Handler;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.Vertices;
-import org.ros.android.views.visualization.shape.Color;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/LaserScanLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/LaserScanLayer.java

@@ -14,13 +14,15 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.shape.Color;
+import org.ros.android.view.visualization.shape.Shape;
+import org.ros.android.view.visualization.shape.TriangleFanShape;
+
 
 import org.apache.commons.lang.ArrayUtils;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.shape.Color;
-import org.ros.android.views.visualization.shape.Shape;
-import org.ros.android.views.visualization.shape.TriangleFanShape;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/Layer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/Layer.java

@@ -14,16 +14,17 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.OpenGlDrawable;
+import org.ros.android.view.visualization.RenderRequestListener;
+import org.ros.android.view.visualization.VisualizationView;
 
 import org.ros.rosjava_geometry.FrameTransformTree;
 
 import android.os.Handler;
 import android.view.MotionEvent;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.OpenGlDrawable;
-import org.ros.android.views.visualization.RenderRequestListener;
-import org.ros.android.views.visualization.VisualizationView;
 import org.ros.node.Node;
 
 /**

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/OccupancyGridLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/OccupancyGridLayer.java

@@ -14,13 +14,14 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.TextureBitmapUtilities;
+import org.ros.android.view.visualization.TextureDrawable;
 
 import android.graphics.Bitmap;
 import android.os.Handler;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.TextureBitmapUtilities;
-import org.ros.android.views.visualization.TextureDrawable;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/PathLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/PathLayer.java

@@ -14,12 +14,14 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.shape.Color;
+
 
 import android.os.Handler;
 import geometry_msgs.PoseStamped;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.shape.Color;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/PosePublisherLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/PosePublisherLayer.java

@@ -14,19 +14,23 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
 
 import com.google.common.base.Preconditions;
 
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.VisualizationView;
+import org.ros.android.view.visualization.shape.PoseShape;
+import org.ros.android.view.visualization.shape.Shape;
+
+
+
+
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Handler;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.VisualizationView;
-import org.ros.android.views.visualization.shape.PoseShape;
-import org.ros.android.views.visualization.shape.Shape;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;
 import org.ros.node.topic.Publisher;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/PoseSubscriberLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/PoseSubscriberLayer.java

@@ -14,12 +14,14 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.shape.GoalShape;
+import org.ros.android.view.visualization.shape.Shape;
+
 
 import android.os.Handler;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.shape.GoalShape;
-import org.ros.android.views.visualization.shape.Shape;
 import org.ros.message.MessageListener;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/RobotLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/RobotLayer.java

@@ -14,16 +14,18 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
+
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.VisualizationView;
+import org.ros.android.view.visualization.shape.RobotShape;
+import org.ros.android.view.visualization.shape.Shape;
+
 
 import android.content.Context;
 import android.os.Handler;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.VisualizationView;
-import org.ros.android.views.visualization.shape.RobotShape;
-import org.ros.android.views.visualization.shape.Shape;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;
 import org.ros.rosjava_geometry.FrameTransformTree;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/SubscriberLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/SubscriberLayer.java

@@ -14,13 +14,16 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
 
 import com.google.common.base.Preconditions;
 
+import org.ros.android.view.visualization.Camera;
+import org.ros.android.view.visualization.VisualizationView;
+
+
+
 import android.os.Handler;
-import org.ros.android.views.visualization.Camera;
-import org.ros.android.views.visualization.VisualizationView;
 import org.ros.namespace.GraphName;
 import org.ros.node.Node;
 import org.ros.node.topic.Subscriber;

android_honeycomb_mr2/src/org/ros/android/views/visualization/layer/TfLayer.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/layer/TfLayer.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.layer;
+package org.ros.android.view.visualization.layer;
 
 import org.ros.namespace.GraphName;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/BaseShape.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/BaseShape.java

@@ -1,8 +1,11 @@
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
 
 import com.google.common.base.Preconditions;
 
-import org.ros.android.views.visualization.OpenGlTransform;
+import org.ros.android.view.visualization.OpenGlTransform;
+
+
+
 import org.ros.rosjava_geometry.Transform;
 
 import javax.microedition.khronos.opengles.GL10;

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/Color.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/Color.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
 
 import com.google.common.base.Preconditions;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/GoalShape.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/GoalShape.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
 
 /**
  * Represents the robot's current goal pose.

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/PoseShape.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/PoseShape.java

@@ -14,9 +14,9 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
 
-import org.ros.android.views.visualization.Camera;
+import org.ros.android.view.visualization.Camera;
 
 import javax.microedition.khronos.opengles.GL10;
 

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/RobotShape.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/RobotShape.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
 
 /**
  * Represents the robot.

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/Shape.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/Shape.java

@@ -14,9 +14,10 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
+
+import org.ros.android.view.visualization.OpenGlDrawable;
 
-import org.ros.android.views.visualization.OpenGlDrawable;
 import org.ros.rosjava_geometry.Transform;
 
 /**

android_honeycomb_mr2/src/org/ros/android/views/visualization/shape/TriangleFanShape.java → android_honeycomb_mr2/src/org/ros/android/view/visualization/shape/TriangleFanShape.java

@@ -14,9 +14,10 @@
  * the License.
  */
 
-package org.ros.android.views.visualization.shape;
+package org.ros.android.view.visualization.shape;
+
+import org.ros.android.view.visualization.Vertices;
 
-import org.ros.android.views.visualization.Vertices;
 import org.ros.rosjava_geometry.Quaternion;
 import org.ros.rosjava_geometry.Transform;
 import org.ros.rosjava_geometry.Vector3;

android_tutorial_camera/AndroidManifest.xml

@@ -1,21 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.ros.android.camera" android:versionCode="1"
-	android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="10" />
-	<uses-permission android:name="android.permission.CAMERA"></uses-permission>
-  	<uses-permission android:name="android.permission.WAKE_LOCK" />  
-	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
-	<application android:icon="@drawable/icon" android:label="@string/app_name"
-		android:debuggable="true">
-		<activity android:name="org.ros.android.tutorial.camera.MainActivity" android:label="@string/app_name"
-			android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity android:name="org.ros.android.MasterChooser"/>
-	 	<service android:name="org.ros.android.NodeRunnerService" /> 
-	</application>
+    package="org.ros.android.android_tutorial_camera"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="10" />
+
+    <uses-permission android:name="android.permission.CAMERA" >
+    </uses-permission>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" >
+    </uses-permission>
+
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name="org.ros.android.android_tutorial_camera.MainActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="org.ros.android.MasterChooser" />
+
+        <service android:name="org.ros.android.NodeRunnerService" />
+    </application>
+
 </manifest>

android_tutorial_camera/src/org/ros/android/tutorial/camera/MainActivity.java → android_tutorial_camera/src/org/ros/android/android_tutorial_camera/MainActivity.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.ros.android.tutorial.camera;
+package org.ros.android.android_tutorial_camera;
 
 import android.content.Intent;
 import android.hardware.Camera;
@@ -26,8 +26,7 @@ import android.widget.Toast;
 import org.ros.address.InetAddressFactory;
 import org.ros.android.MasterChooser;
 import org.ros.android.RosActivity;
-import org.ros.android.camera.R;
-import org.ros.android.views.RosCameraPreviewView;
+import org.ros.android.view.RosCameraPreviewView;
 import org.ros.node.NodeConfiguration;
 import org.ros.node.NodeMainExecutor;
 

android_tutorial_image_transport/AndroidManifest.xml

@@ -1,19 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.ros.android.tutorial.image_transport" android:versionCode="1"
-	android:versionName="1.0">
-	<uses-sdk 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">
-		<activity android:name="org.ros.android.tutorial.image_transport.MainActivity" android:label="@string/app_name"
-			android:screenOrientation="landscape" android:configChanges="keyboardHidden|orientation">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity android:name="org.ros.android.MasterChooser" />
-    		<service android:name="org.ros.android.NodeRunnerService" />    
-	</application>
-</manifest>
+    package="org.ros.android.android_tutorial_image_transport"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk 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" >
+        <activity
+            android:name="org.ros.android.android_tutorial_image_transport.MainActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="org.ros.android.MasterChooser" />
+
+        <service android:name="org.ros.android.NodeRunnerService" />
+    </application>
+
+</manifest>

android_tutorial_image_transport/src/org/ros/android/tutorial/image_transport/MainActivity.java → android_tutorial_image_transport/src/org/ros/android/android_tutorial_image_transport/MainActivity.java

@@ -14,13 +14,13 @@
  * the License.
  */
 
-package org.ros.android.tutorial.image_transport;
+package org.ros.android.android_tutorial_image_transport;
 
 import android.os.Bundle;
 import org.ros.address.InetAddressFactory;
 import org.ros.android.BitmapFromCompressedImage;
 import org.ros.android.RosActivity;
-import org.ros.android.views.RosImageView;
+import org.ros.android.view.RosImageView;
 import org.ros.node.NodeConfiguration;
 import org.ros.node.NodeMainExecutor;
 

android_tutorial_pubsub/AndroidManifest.xml

@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.ros.tutorials.pubsub"
-  android:versionCode="1"
-  android:versionName="1.0">
-  <uses-sdk 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">
-    <activity
-      android:label="@string/app_name"
-      android:name="org.ros.android.tutorial.pubsub.MainActivity">
-      <intent-filter >
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <activity android:name="org.ros.android.MasterChooser" />
-    <service android:name="org.ros.android.NodeRunnerService" />
-  </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.ros.android.android_tutorial_pubsub"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk 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" >
+        <activity
+            android:name="org.ros.android.android_tutorial_pubsub.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="org.ros.android.MasterChooser" />
+
+        <service android:name="org.ros.android.NodeRunnerService" />
+    </application>
+
+</manifest>

android_tutorial_pubsub/src/org/ros/android/tutorial/pubsub/MainActivity.java → android_tutorial_pubsub/src/org/ros/android/android_tutorial_pubsub/MainActivity.java

@@ -14,16 +14,15 @@
  * the License.
  */
 
-package org.ros.android.tutorial.pubsub;
+package org.ros.android.android_tutorial_pubsub;
 
 import android.os.Bundle;
 import org.ros.RosCore;
 import org.ros.android.MessageCallable;
 import org.ros.android.RosActivity;
-import org.ros.android.views.RosTextView;
+import org.ros.android.view.RosTextView;
 import org.ros.node.NodeConfiguration;
 import org.ros.node.NodeMainExecutor;
-import org.ros.tutorials.pubsub.R;
 import org.ros.tutorials.pubsub.Talker;
 
 /**

android_tutorial_teleop/AndroidManifest.xml

@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.ros.android.tutorial.teleop" android:versionCode="1"
-  android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="13" android:targetSdkVersion="13" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />  
+    package="org.ros.android.android_tutorial_teleop"
+    android:versionCode="1"
+    android:versionName="1.0" >
 
-  <application android:icon="@drawable/icon" android:label="@string/app_name"
-    android:debuggable="true">
-    <activity android:name="org.ros.android.tutorial.teleop.MainActivity"
-      android:label="@string/app_name" android:screenOrientation="landscape">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <activity android:name="org.ros.android.MasterChooser" />
-    <service android:name="org.ros.android.NodeRunnerService" />    
-  </application>
-</manifest>
+    <uses-sdk
+        android:minSdkVersion="13"
+        android:targetSdkVersion="13" />
+
+    <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" >
+        <activity
+            android:name="org.ros.android.android_tutorial_teleop.MainActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="org.ros.android.MasterChooser" />
+
+        <service android:name="org.ros.android.NodeRunnerService" />
+    </application>
+
+</manifest>

android_tutorial_teleop/src/org/ros/android/tutorial/teleop/MainActivity.java

@@ -22,15 +22,16 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import org.ros.address.InetAddressFactory;
 import org.ros.android.RosActivity;
-import org.ros.android.views.VirtualJoystickView;
-import org.ros.android.views.visualization.VisualizationView;
-import org.ros.android.views.visualization.layer.CameraControlLayer;
-import org.ros.android.views.visualization.layer.CompressedBitmapLayer;
-import org.ros.android.views.visualization.layer.LaserScanLayer;
-import org.ros.android.views.visualization.layer.PathLayer;
-import org.ros.android.views.visualization.layer.PosePublisherLayer;
-import org.ros.android.views.visualization.layer.PoseSubscriberLayer;
-import org.ros.android.views.visualization.layer.RobotLayer;
+import org.ros.android.android_tutorial_teleop.R;
+import org.ros.android.view.VirtualJoystickView;
+import org.ros.android.view.visualization.VisualizationView;
+import org.ros.android.view.visualization.layer.CameraControlLayer;
+import org.ros.android.view.visualization.layer.CompressedBitmapLayer;
+import org.ros.android.view.visualization.layer.LaserScanLayer;
+import org.ros.android.view.visualization.layer.PathLayer;
+import org.ros.android.view.visualization.layer.PosePublisherLayer;
+import org.ros.android.view.visualization.layer.PoseSubscriberLayer;
+import org.ros.android.view.visualization.layer.RobotLayer;
 import org.ros.node.NodeConfiguration;
 import org.ros.node.NodeMainExecutor;
 

docs/build.gradle

@@ -16,6 +16,15 @@
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
+task javadoc(type: Javadoc) {
+  def javaProjects = rootProject.subprojects.findResults {
+    (it.name != 'docs') ? it : null
+  }
+  source javaProjects.collect { fileTree(dir: "${it.projectDir}/src") }
+  classpath = files(javaProjects.collect { it.configurations.compile })
+  destinationDir = new File("${buildDir}/html", 'javadoc')
+}
+
 task copySphinxConf(type: Copy) {
   from('src/main/sphinx/conf.py.in') {
     filter(ReplaceTokens, tokens: ['version': rootProject.version])
@@ -24,7 +33,7 @@ task copySphinxConf(type: Copy) {
   rename 'conf.py.in', 'conf.py'
 }
 
-task install(type: Exec, dependsOn: copySphinxConf) {
+task install(type: Exec, dependsOn: [copySphinxConf, javadoc]) {
   commandLine 'make', 'html'
 }
 

docs/src/main/sphinx/conf.py.in

@@ -98,7 +98,7 @@ highlight_language = 'java'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'haiku'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/src/main/sphinx/index.rst

@@ -1,12 +1,28 @@
 android_core
 ============
 
+android_core is a collection of components and examples that are useful for
+developing ROS applications on Android. It provides a base `Activity`_
+(:javadoc:`org.ros.android.RosActivity`) and `Service`_
+(:javadoc:`org.ros.android.NodeMainExecutorService`) for executing and managing
+the lifecycle of your :javadoc:`org.ros.node.NodeMain`\s.
+
+In addition, android_core defines the pattern of combining the Android `View`_
+and :javadoc:`org.ros.node.NodeMain` concepts that enables the development of
+data driven Android UIs. Several such RosViews (e.g.
+:javadoc:`org.ros.android.view.RosTextView`,
+:javadoc:`org.ros.android.view.RosImageView`,
+and :javadoc:`org.ros.android.view.RosCameraPreviewView`) are provided.
+
 Support is best found on http://answers.ros.org/.
 
 Please file bugs and feature requests on the rosjava `issues`_ page. Starring
 issues that are important to you will help developers prioritize their work.
 
 .. _issues: http://code.google.com/p/rosjava/issues/list
+.. _Activity: http://developer.android.com/reference/android/app/Activity.html
+.. _Service: http://developer.android.com/reference/android/app/Service.html
+.. _View: http://developer.android.com/reference/android/view/View.html
 
 Contents: