diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 27ecb195..ad1fecff 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
Changelog
=========
+0.4.0 (2018-10-04)
+* Deprecating android_10 and android_15; adding support for Android P.
+* Minor fixes for visualization layers.
+* Made LocalBinder class public.
+* Gradle 4.10.2 update.
+* Contributors: Rob (rking788), Juan Ignacio Ubeira, Julian Cerruti.
+
0.3.3 (2017-04-17)
------------------
* Several MasterChooser fixes and improvements.
diff --git a/android_15/AndroidManifest.xml b/android_15/AndroidManifest.xml
deleted file mode 100644
index ed2818a0..00000000
--- a/android_15/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/android_15/build.gradle b/android_15/build.gradle
deleted file mode 100644
index 1f5941f2..00000000
--- a/android_15/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc.
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-
-dependencies {
- compile 'org.ros.rosjava_core:rosjava_geometry:[0.3,0.4)'
- compile 'com.android.support:support-v4:25.1.0'
- compile 'org.ros.rosjava_messages:visualization_msgs:[1.12,1.13)'
- compile project(':android_10')
-}
-
-apply plugin: 'com.android.library'
-
-android {
- compileSdkVersion 25
-
- defaultConfig {
- minSdkVersion 15
- targetSdkVersion 15
- versionCode 1
- versionName "1.0"
- }
-}
diff --git a/android_acm_serial/build.gradle b/android_acm_serial/build.gradle
index 986e06b7..cc9559b5 100644
--- a/android_acm_serial/build.gradle
+++ b/android_acm_serial/build.gradle
@@ -15,18 +15,17 @@
*/
dependencies {
- compile project(':android_15')
- compile project(':android_10')
+ compile project(':android_core_components')
}
apply plugin: 'com.android.library'
android {
- compileSdkVersion 25
+ compileSdkVersion 28
defaultConfig {
- minSdkVersion 15
- targetSdkVersion 15
+ minSdkVersion 16
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
}
diff --git a/android_benchmarks/AndroidManifest.xml b/android_benchmarks/AndroidManifest.xml
index bc17e3d4..86106d85 100644
--- a/android_benchmarks/AndroidManifest.xml
+++ b/android_benchmarks/AndroidManifest.xml
@@ -3,6 +3,7 @@
+
+ package="org.ros.android.android_core_components">
@@ -10,6 +10,7 @@
+
listeners;
@@ -112,7 +119,7 @@ public void onCreate() {
// We must be running on a pre-Honeycomb device.
Log.w(TAG, "Unable to acquire high performance wifi lock.");
}
- WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+ WifiManager wifiManager = WifiManager.class.cast(getApplicationContext().getSystemService(WIFI_SERVICE));
wifiLock = wifiManager.createWifiLock(wifiLockType, TAG);
wifiLock.acquire();
}
@@ -157,7 +164,7 @@ public void onClick(DialogInterface dialog, int which) {
}
});
AlertDialog alertDialog = builder.create();
- alertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+ alertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST);
alertDialog.show();
}
});
@@ -211,18 +218,11 @@ public int onStartCommand(Intent intent, int flags, int startId) {
if (intent.getAction().equals(ACTION_START)) {
Preconditions.checkArgument(intent.hasExtra(EXTRA_NOTIFICATION_TICKER));
Preconditions.checkArgument(intent.hasExtra(EXTRA_NOTIFICATION_TITLE));
- NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
Intent notificationIntent = new Intent(this, NodeMainExecutorService.class);
notificationIntent.setAction(NodeMainExecutorService.ACTION_SHUTDOWN);
PendingIntent pendingIntent = PendingIntent.getService(this, 0, notificationIntent, 0);
- Notification notification = builder.setContentIntent(pendingIntent)
- .setSmallIcon(R.mipmap.icon)
- .setTicker(intent.getStringExtra(EXTRA_NOTIFICATION_TICKER))
- .setWhen(System.currentTimeMillis())
- .setContentTitle(intent.getStringExtra(EXTRA_NOTIFICATION_TITLE))
- .setAutoCancel(true)
- .setContentText("Tap to shutdown.")
- .build();
+ Notification notification = buildNotification(intent, pendingIntent);
+
startForeground(ONGOING_NOTIFICATION, notification);
}
if (intent.getAction().equals(ACTION_SHUTDOWN)) {
@@ -312,4 +312,31 @@ public void run() {
}
});
}
+
+ private Notification buildNotification(Intent intent, PendingIntent pendingIntent) {
+ Notification notification = null;
+ Notification.Builder builder = null;
+ if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
+ NotificationChannel chan = new NotificationChannel(
+ NOTIFICATION_CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_NONE);
+ chan.setLightColor(Color.BLUE);
+ chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+ NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+ assert manager != null;
+ manager.createNotificationChannel(chan);
+ builder = new Notification.Builder(this, NOTIFICATION_CHANNEL_ID);
+ } else {
+ builder = new Notification.Builder(this);
+ }
+ notification = builder.setContentIntent(pendingIntent)
+ .setOngoing(true)
+ .setSmallIcon(R.mipmap.icon)
+ .setTicker(intent.getStringExtra(EXTRA_NOTIFICATION_TICKER))
+ .setWhen(System.currentTimeMillis())
+ .setContentTitle(intent.getStringExtra(EXTRA_NOTIFICATION_TITLE))
+ .setAutoCancel(true)
+ .setContentText("Tap to shutdown.")
+ .build();
+ return notification;
+ }
}
diff --git a/android_10/src/org/ros/android/NodeMainExecutorServiceListener.java b/android_core_components/src/org/ros/android/NodeMainExecutorServiceListener.java
similarity index 100%
rename from android_10/src/org/ros/android/NodeMainExecutorServiceListener.java
rename to android_core_components/src/org/ros/android/NodeMainExecutorServiceListener.java
diff --git a/android_10/src/org/ros/android/OrientationPublisher.java b/android_core_components/src/org/ros/android/OrientationPublisher.java
similarity index 100%
rename from android_10/src/org/ros/android/OrientationPublisher.java
rename to android_core_components/src/org/ros/android/OrientationPublisher.java
diff --git a/android_10/src/org/ros/android/RosActivity.java b/android_core_components/src/org/ros/android/RosActivity.java
similarity index 100%
rename from android_10/src/org/ros/android/RosActivity.java
rename to android_core_components/src/org/ros/android/RosActivity.java
diff --git a/android_10/src/org/ros/android/view/DiagnosticsArrayView.java b/android_core_components/src/org/ros/android/view/DiagnosticsArrayView.java
similarity index 97%
rename from android_10/src/org/ros/android/view/DiagnosticsArrayView.java
rename to android_core_components/src/org/ros/android/view/DiagnosticsArrayView.java
index e465266e..3a5e504f 100644
--- a/android_10/src/org/ros/android/view/DiagnosticsArrayView.java
+++ b/android_core_components/src/org/ros/android/view/DiagnosticsArrayView.java
@@ -37,7 +37,7 @@
import android.widget.TableLayout;
import diagnostic_msgs.DiagnosticArray;
import diagnostic_msgs.DiagnosticStatus;
-import org.ros.android.android_10.R;
+import org.ros.android.android_core_components.R;
import org.ros.message.MessageListener;
import org.ros.namespace.GraphName;
import org.ros.node.ConnectedNode;
@@ -85,7 +85,7 @@ private void init() {
@Override
public GraphName getDefaultNodeName() {
- return GraphName.of("android_10/diagnostics_array_view");
+ return GraphName.of("android_core_components/diagnostics_array_view");
}
@Override
diff --git a/android_15/src/org/ros/android/view/DistancePoints.java b/android_core_components/src/org/ros/android/view/DistancePoints.java
similarity index 100%
rename from android_15/src/org/ros/android/view/DistancePoints.java
rename to android_core_components/src/org/ros/android/view/DistancePoints.java
diff --git a/android_15/src/org/ros/android/view/DistanceRenderer.java b/android_core_components/src/org/ros/android/view/DistanceRenderer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/DistanceRenderer.java
rename to android_core_components/src/org/ros/android/view/DistanceRenderer.java
diff --git a/android_15/src/org/ros/android/view/DistanceView.java b/android_core_components/src/org/ros/android/view/DistanceView.java
similarity index 100%
rename from android_15/src/org/ros/android/view/DistanceView.java
rename to android_core_components/src/org/ros/android/view/DistanceView.java
diff --git a/android_15/src/org/ros/android/view/PanTiltView.java b/android_core_components/src/org/ros/android/view/PanTiltView.java
similarity index 99%
rename from android_15/src/org/ros/android/view/PanTiltView.java
rename to android_core_components/src/org/ros/android/view/PanTiltView.java
index b202ccfc..4b2e0066 100644
--- a/android_15/src/org/ros/android/view/PanTiltView.java
+++ b/android_core_components/src/org/ros/android/view/PanTiltView.java
@@ -25,7 +25,8 @@
import android.view.View.OnTouchListener;
import android.widget.ImageView;
import android.widget.RelativeLayout;
-import org.ros.android.android_15.R;
+
+import org.ros.android.android_core_components.R;
import org.ros.namespace.GraphName;
import org.ros.node.ConnectedNode;
import org.ros.node.Node;
diff --git a/android_10/src/org/ros/android/view/RosImageView.java b/android_core_components/src/org/ros/android/view/RosImageView.java
similarity index 100%
rename from android_10/src/org/ros/android/view/RosImageView.java
rename to android_core_components/src/org/ros/android/view/RosImageView.java
diff --git a/android_10/src/org/ros/android/view/RosTextView.java b/android_core_components/src/org/ros/android/view/RosTextView.java
similarity index 100%
rename from android_10/src/org/ros/android/view/RosTextView.java
rename to android_core_components/src/org/ros/android/view/RosTextView.java
diff --git a/android_15/src/org/ros/android/view/VirtualJoystickView.java b/android_core_components/src/org/ros/android/view/VirtualJoystickView.java
similarity index 99%
rename from android_15/src/org/ros/android/view/VirtualJoystickView.java
rename to android_core_components/src/org/ros/android/view/VirtualJoystickView.java
index 72034c6a..6ddd00d7 100644
--- a/android_15/src/org/ros/android/view/VirtualJoystickView.java
+++ b/android_core_components/src/org/ros/android/view/VirtualJoystickView.java
@@ -31,7 +31,8 @@
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import org.ros.android.android_15.R;
+
+import org.ros.android.android_core_components.R;
import org.ros.message.MessageListener;
import org.ros.namespace.GraphName;
import org.ros.node.ConnectedNode;
diff --git a/android_15/src/org/ros/android/view/ZoomMode.java b/android_core_components/src/org/ros/android/view/ZoomMode.java
similarity index 100%
rename from android_15/src/org/ros/android/view/ZoomMode.java
rename to android_core_components/src/org/ros/android/view/ZoomMode.java
diff --git a/android_10/src/org/ros/android/view/camera/CameraPreviewView.java b/android_core_components/src/org/ros/android/view/camera/CameraPreviewView.java
similarity index 100%
rename from android_10/src/org/ros/android/view/camera/CameraPreviewView.java
rename to android_core_components/src/org/ros/android/view/camera/CameraPreviewView.java
diff --git a/android_10/src/org/ros/android/view/camera/CompressedImagePublisher.java b/android_core_components/src/org/ros/android/view/camera/CompressedImagePublisher.java
similarity index 100%
rename from android_10/src/org/ros/android/view/camera/CompressedImagePublisher.java
rename to android_core_components/src/org/ros/android/view/camera/CompressedImagePublisher.java
diff --git a/android_10/src/org/ros/android/view/camera/RawImageListener.java b/android_core_components/src/org/ros/android/view/camera/RawImageListener.java
similarity index 100%
rename from android_10/src/org/ros/android/view/camera/RawImageListener.java
rename to android_core_components/src/org/ros/android/view/camera/RawImageListener.java
diff --git a/android_10/src/org/ros/android/view/camera/RosCameraPreviewView.java b/android_core_components/src/org/ros/android/view/camera/RosCameraPreviewView.java
similarity index 100%
rename from android_10/src/org/ros/android/view/camera/RosCameraPreviewView.java
rename to android_core_components/src/org/ros/android/view/camera/RosCameraPreviewView.java
diff --git a/android_15/src/org/ros/android/view/visualization/Color.java b/android_core_components/src/org/ros/android/view/visualization/Color.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/Color.java
rename to android_core_components/src/org/ros/android/view/visualization/Color.java
diff --git a/android_15/src/org/ros/android/view/visualization/OpenGlDrawable.java b/android_core_components/src/org/ros/android/view/visualization/OpenGlDrawable.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/OpenGlDrawable.java
rename to android_core_components/src/org/ros/android/view/visualization/OpenGlDrawable.java
diff --git a/android_15/src/org/ros/android/view/visualization/OpenGlTransform.java b/android_core_components/src/org/ros/android/view/visualization/OpenGlTransform.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/OpenGlTransform.java
rename to android_core_components/src/org/ros/android/view/visualization/OpenGlTransform.java
diff --git a/android_15/src/org/ros/android/view/visualization/RotateGestureDetector.java b/android_core_components/src/org/ros/android/view/visualization/RotateGestureDetector.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/RotateGestureDetector.java
rename to android_core_components/src/org/ros/android/view/visualization/RotateGestureDetector.java
diff --git a/android_15/src/org/ros/android/view/visualization/TextureBitmap.java b/android_core_components/src/org/ros/android/view/visualization/TextureBitmap.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/TextureBitmap.java
rename to android_core_components/src/org/ros/android/view/visualization/TextureBitmap.java
diff --git a/android_15/src/org/ros/android/view/visualization/Vertices.java b/android_core_components/src/org/ros/android/view/visualization/Vertices.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/Vertices.java
rename to android_core_components/src/org/ros/android/view/visualization/Vertices.java
diff --git a/android_15/src/org/ros/android/view/visualization/Viewport.java b/android_core_components/src/org/ros/android/view/visualization/Viewport.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/Viewport.java
rename to android_core_components/src/org/ros/android/view/visualization/Viewport.java
diff --git a/android_15/src/org/ros/android/view/visualization/VisualizationView.java b/android_core_components/src/org/ros/android/view/visualization/VisualizationView.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/VisualizationView.java
rename to android_core_components/src/org/ros/android/view/visualization/VisualizationView.java
diff --git a/android_15/src/org/ros/android/view/visualization/XYOrthographicCamera.java b/android_core_components/src/org/ros/android/view/visualization/XYOrthographicCamera.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/XYOrthographicCamera.java
rename to android_core_components/src/org/ros/android/view/visualization/XYOrthographicCamera.java
diff --git a/android_15/src/org/ros/android/view/visualization/XYOrthographicRenderer.java b/android_core_components/src/org/ros/android/view/visualization/XYOrthographicRenderer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/XYOrthographicRenderer.java
rename to android_core_components/src/org/ros/android/view/visualization/XYOrthographicRenderer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/CameraControlLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/CameraControlLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/CameraControlLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/CameraControlLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/CameraControlListener.java b/android_core_components/src/org/ros/android/view/visualization/layer/CameraControlListener.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/CameraControlListener.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/CameraControlListener.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/CompressedOccupancyGridLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/CompressedOccupancyGridLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/CompressedOccupancyGridLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/CompressedOccupancyGridLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/DefaultLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/DefaultLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/DefaultLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/DefaultLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/GridCellsLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/GridCellsLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/GridCellsLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/GridCellsLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/LaserScanLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/LaserScanLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/LaserScanLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/LaserScanLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/Layer.java b/android_core_components/src/org/ros/android/view/visualization/layer/Layer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/Layer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/Layer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/OccupancyGridLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/OccupancyGridLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/OccupancyGridLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/OccupancyGridLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/PathLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/PathLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/PathLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/PathLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/PointCloud2DLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/PointCloud2DLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/PointCloud2DLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/PointCloud2DLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/PosePublisherLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/PosePublisherLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/PosePublisherLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/PosePublisherLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/PoseSubscriberLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/PoseSubscriberLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/PoseSubscriberLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/PoseSubscriberLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/RobotLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/RobotLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/RobotLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/RobotLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/SubscriberLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/SubscriberLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/SubscriberLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/SubscriberLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/layer/TfLayer.java b/android_core_components/src/org/ros/android/view/visualization/layer/TfLayer.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/layer/TfLayer.java
rename to android_core_components/src/org/ros/android/view/visualization/layer/TfLayer.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/BaseShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/BaseShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/BaseShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/BaseShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/GoalShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/GoalShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/GoalShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/GoalShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/MetricSpacePoiShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/MetricSpacePoiShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/MetricSpacePoiShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/MetricSpacePoiShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/MetricSpacePolygon.java b/android_core_components/src/org/ros/android/view/visualization/shape/MetricSpacePolygon.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/MetricSpacePolygon.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/MetricSpacePolygon.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/MetricSpacePoseShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/MetricSpacePoseShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/MetricSpacePoseShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/MetricSpacePoseShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/PixelSpacePoiShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/PixelSpacePoiShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/PixelSpacePoiShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/PixelSpacePoiShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/PixelSpacePoseShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/PixelSpacePoseShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/PixelSpacePoseShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/PixelSpacePoseShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/Shape.java b/android_core_components/src/org/ros/android/view/visualization/shape/Shape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/Shape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/Shape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/TextShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/TextShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/TextShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/TextShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/TextShapeFactory.java b/android_core_components/src/org/ros/android/view/visualization/shape/TextShapeFactory.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/TextShapeFactory.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/TextShapeFactory.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/TriangleFanShape.java b/android_core_components/src/org/ros/android/view/visualization/shape/TriangleFanShape.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/TriangleFanShape.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/TriangleFanShape.java
diff --git a/android_15/src/org/ros/android/view/visualization/shape/Triangulate.java b/android_core_components/src/org/ros/android/view/visualization/shape/Triangulate.java
similarity index 100%
rename from android_15/src/org/ros/android/view/visualization/shape/Triangulate.java
rename to android_core_components/src/org/ros/android/view/visualization/shape/Triangulate.java
diff --git a/android_15/src/uk/co/blogspot/fractiousg/texample/GLText.java b/android_core_components/src/uk/co/blogspot/fractiousg/texample/GLText.java
similarity index 100%
rename from android_15/src/uk/co/blogspot/fractiousg/texample/GLText.java
rename to android_core_components/src/uk/co/blogspot/fractiousg/texample/GLText.java
diff --git a/android_15/src/uk/co/blogspot/fractiousg/texample/SpriteBatch.java b/android_core_components/src/uk/co/blogspot/fractiousg/texample/SpriteBatch.java
similarity index 100%
rename from android_15/src/uk/co/blogspot/fractiousg/texample/SpriteBatch.java
rename to android_core_components/src/uk/co/blogspot/fractiousg/texample/SpriteBatch.java
diff --git a/android_15/src/uk/co/blogspot/fractiousg/texample/TextureRegion.java b/android_core_components/src/uk/co/blogspot/fractiousg/texample/TextureRegion.java
similarity index 100%
rename from android_15/src/uk/co/blogspot/fractiousg/texample/TextureRegion.java
rename to android_core_components/src/uk/co/blogspot/fractiousg/texample/TextureRegion.java
diff --git a/android_15/src/uk/co/blogspot/fractiousg/texample/Vertices.java b/android_core_components/src/uk/co/blogspot/fractiousg/texample/Vertices.java
similarity index 100%
rename from android_15/src/uk/co/blogspot/fractiousg/texample/Vertices.java
rename to android_core_components/src/uk/co/blogspot/fractiousg/texample/Vertices.java
diff --git a/android_tutorial_camera/AndroidManifest.xml b/android_tutorial_camera/AndroidManifest.xml
index 6b743c92..adb30e18 100644
--- a/android_tutorial_camera/AndroidManifest.xml
+++ b/android_tutorial_camera/AndroidManifest.xml
@@ -7,6 +7,7 @@
+
+
+
+
\(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index aec99730..e95643d6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail
:init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
diff --git a/package.xml b/package.xml
index b78db86e..dd80768e 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
android_core
- 0.3.3
+ 0.4.0
Android support packages for rosjava.
diff --git a/settings.gradle b/settings.gradle
index a7b22dfd..4dd885c8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,7 @@
* the License.
*/
-include "android_10"
-include "android_15"
+include "android_core_components"
include "android_acm_serial"
include "android_benchmarks"
include "android_tutorial_camera"