Permalink
Browse files

changes for rosjava

  • Loading branch information...
1 parent 9eb2790 commit eb2c5e4751ca7b0a068c75bfb8f6cdfc822b7856 @hugomatic hugomatic committed Nov 16, 2012
Showing with 22 additions and 26 deletions.
  1. +11 −17 AndroidManifest.xml
  2. +1 −0 res/layout/main.xml
  3. +10 −9 src/ros/android/teleop/Teleop.java
View
@@ -2,27 +2,21 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ros.android.teleop" android:versionCode="2"
android:versionName="1.1">
- <uses-sdk android:minSdkVersion="9" />
-
+ <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" android:maxSdkVersion="13"/>
+
+ <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
<application android:icon="@drawable/android_lightning_turtlebot" android:label="@string/app_name">
-
- <activity android:name=".Teleop" 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>
- <intent-filter>
- <action android:name="ros.android.teleop.Teleop" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
<activity android:name="ros.android.activity.MasterChooserActivity"
android:label="@string/app_name">
</activity>
+ <activity android:name="Teleop"></activity>
+ <uses-library />
+ <activity android:name="ros.android.activity.AppChooserRedirectActivity"></activity>
+ <activity android:name="org.ros.android.MasterChooser"></activity>
+
</application>
- <uses-permission android:name="android.permission.INTERNET"></uses-permission>
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
</manifest>
View
@@ -28,6 +28,7 @@
android:gravity="bottom"
android:src="@drawable/joystick_white"
android:id="@+id/joystick"/>
+
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -28,20 +28,21 @@
*/
package ros.android.teleop;
+import org.ros.exception.RosException;
+import org.ros.namespace.NameResolver;
+import org.ros.node.ConnectedNode;
+import org.ros.node.Node;
+
+import ros.android.activity.RosAppActivity;
+import ros.android.views.JoystickView;
+import ros.android.views.SensorImageView;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.view.View;
import android.widget.Toast;
-import org.ros.node.Node;
-import org.ros.node.topic.Subscriber;
-import org.ros.exception.RosException;
-import org.ros.namespace.NameResolver;
-import ros.android.activity.RosAppActivity;
-import ros.android.views.SensorImageView;
-import ros.android.views.JoystickView;
+//import ros.android.activity.R;
/**
* @author kwc@willowgarage.com (Ken Conley)
@@ -93,7 +94,7 @@ protected void onResume() {
}
@Override
- protected void onNodeCreate(Node node) {
+ protected void onNodeCreate(ConnectedNode node) {
Log.i("Teleop", "startAppFuture");
super.onNodeCreate(node);
try {

0 comments on commit eb2c5e4

Please sign in to comment.