Move robot demo to contrib/

diff --git a/README.android b/README.android
index daa6ecebb70cbfcc6ed308ad1fbb054de4111384..e85ccc2f1a89c2b0b73c68a2e77330ef34f962c7 100644 (file)
--- a/README.android
+++ b/README.android
@@ -11,10 +11,10 @@ there are several steps needed to compile the app:
 2) go to <sdk-folder>/tools and execute "android"
 3) download "SDK Platform" for "API 15" - Android 4.0.3
 4) go to orte/libaorte and execute "android update project -p .", then
-   go to orte/Robot_Demo and do the same
+   go to orte/contrib/Robot_Demo and do the same
 5) go to orte/libaorte and execute "ndk-build" - this builds native
    code
-6) go to orte/Robot_Demo and execute "ant debug" - this will prepare
+6) go to orte/contrib/Robot_Demo and execute "ant debug" - this will prepare
    Android .apk file signed with automatically generated debug key
 7) the generated .apk is located in
-   orte/Robot_Demo/bin/RoboDruid-debug.apk
+   orte/contrib/Robot_Demo/bin/RoboDruid-debug.apk

diff --git a/orte/Robot_Demo/.classpath b/orte/contrib/Robot_Demo/.classpath
similarity index 100%
rename from orte/Robot_Demo/.classpath
rename to orte/contrib/Robot_Demo/.classpath

diff --git a/orte/Robot_Demo/.project b/orte/contrib/Robot_Demo/.project
similarity index 100%
rename from orte/Robot_Demo/.project
rename to orte/contrib/Robot_Demo/.project

diff --git a/orte/Robot_Demo/.settings/org.eclipse.jdt.core.prefs b/orte/contrib/Robot_Demo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from orte/Robot_Demo/.settings/org.eclipse.jdt.core.prefs
rename to orte/contrib/Robot_Demo/.settings/org.eclipse.jdt.core.prefs

diff --git a/orte/Robot_Demo/AndroidManifest.xml b/orte/contrib/Robot_Demo/AndroidManifest.xml
similarity index 100%
rename from orte/Robot_Demo/AndroidManifest.xml
rename to orte/contrib/Robot_Demo/AndroidManifest.xml

diff --git a/orte/Robot_Demo/build.xml b/orte/contrib/Robot_Demo/build.xml
similarity index 100%
rename from orte/Robot_Demo/build.xml
rename to orte/contrib/Robot_Demo/build.xml

diff --git a/orte/Robot_Demo/ic_launcher-web.png b/orte/contrib/Robot_Demo/ic_launcher-web.png
similarity index 100%
rename from orte/Robot_Demo/ic_launcher-web.png
rename to orte/contrib/Robot_Demo/ic_launcher-web.png

diff --git a/orte/Robot_Demo/proguard-project.txt b/orte/contrib/Robot_Demo/proguard-project.txt
similarity index 100%
rename from orte/Robot_Demo/proguard-project.txt
rename to orte/contrib/Robot_Demo/proguard-project.txt

diff --git a/orte/Robot_Demo/project.properties b/orte/contrib/Robot_Demo/project.properties
similarity index 92%
rename from orte/Robot_Demo/project.properties
rename to orte/contrib/Robot_Demo/project.properties
index 09ed830856a2a1b051798a9bc345f9ed7545385c..f5a9ea3992c759f2bf6642ca2ebecf99eb280dbc 100644 (file)
--- a/orte/Robot_Demo/project.properties
+++ b/orte/contrib/Robot_Demo/project.properties
@@ -12,4 +12,4 @@
 
 # Project target.
 target=android-15
-android.library.reference.1=../libaorte
+android.library.reference.1=../../libaorte

diff --git a/orte/Robot_Demo/res/drawable-hdpi/ic_launcher.png b/orte/contrib/Robot_Demo/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable-hdpi/ic_launcher.png
rename to orte/contrib/Robot_Demo/res/drawable-hdpi/ic_launcher.png

diff --git a/orte/Robot_Demo/res/drawable-ldpi/ic_launcher.png b/orte/contrib/Robot_Demo/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable-ldpi/ic_launcher.png
rename to orte/contrib/Robot_Demo/res/drawable-ldpi/ic_launcher.png

diff --git a/orte/Robot_Demo/res/drawable-mdpi/ic_launcher.png b/orte/contrib/Robot_Demo/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable-mdpi/ic_launcher.png
rename to orte/contrib/Robot_Demo/res/drawable-mdpi/ic_launcher.png

diff --git a/orte/Robot_Demo/res/drawable-xhdpi/ic_launcher.png b/orte/contrib/Robot_Demo/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable-xhdpi/ic_launcher.png
rename to orte/contrib/Robot_Demo/res/drawable-xhdpi/ic_launcher.png

diff --git a/orte/Robot_Demo/res/drawable-xxhdpi/ic_launcher.png b/orte/contrib/Robot_Demo/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable-xxhdpi/ic_launcher.png
rename to orte/contrib/Robot_Demo/res/drawable-xxhdpi/ic_launcher.png

diff --git a/orte/Robot_Demo/res/drawable/logo_cvut.png b/orte/contrib/Robot_Demo/res/drawable/logo_cvut.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable/logo_cvut.png
rename to orte/contrib/Robot_Demo/res/drawable/logo_cvut.png

diff --git a/orte/Robot_Demo/res/drawable/logo_flamingos.png b/orte/contrib/Robot_Demo/res/drawable/logo_flamingos.png
similarity index 100%
rename from orte/Robot_Demo/res/drawable/logo_flamingos.png
rename to orte/contrib/Robot_Demo/res/drawable/logo_flamingos.png

diff --git a/orte/Robot_Demo/res/layout/about_dialog.xml b/orte/contrib/Robot_Demo/res/layout/about_dialog.xml
similarity index 100%
rename from orte/Robot_Demo/res/layout/about_dialog.xml
rename to orte/contrib/Robot_Demo/res/layout/about_dialog.xml

diff --git a/orte/Robot_Demo/res/layout/hokuyo_view.xml b/orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml
similarity index 100%
rename from orte/Robot_Demo/res/layout/hokuyo_view.xml
rename to orte/contrib/Robot_Demo/res/layout/hokuyo_view.xml

diff --git a/orte/Robot_Demo/res/layout/managers_view.xml b/orte/contrib/Robot_Demo/res/layout/managers_view.xml
similarity index 100%
rename from orte/Robot_Demo/res/layout/managers_view.xml
rename to orte/contrib/Robot_Demo/res/layout/managers_view.xml

diff --git a/orte/Robot_Demo/res/layout/status_dialog.xml b/orte/contrib/Robot_Demo/res/layout/status_dialog.xml
similarity index 100%
rename from orte/Robot_Demo/res/layout/status_dialog.xml
rename to orte/contrib/Robot_Demo/res/layout/status_dialog.xml

diff --git a/orte/Robot_Demo/res/menu/activity_main.xml b/orte/contrib/Robot_Demo/res/menu/activity_main.xml
similarity index 100%
rename from orte/Robot_Demo/res/menu/activity_main.xml
rename to orte/contrib/Robot_Demo/res/menu/activity_main.xml

diff --git a/orte/Robot_Demo/res/values-v11/styles.xml b/orte/contrib/Robot_Demo/res/values-v11/styles.xml
similarity index 100%
rename from orte/Robot_Demo/res/values-v11/styles.xml
rename to orte/contrib/Robot_Demo/res/values-v11/styles.xml

diff --git a/orte/Robot_Demo/res/values-v14/styles.xml b/orte/contrib/Robot_Demo/res/values-v14/styles.xml
similarity index 100%
rename from orte/Robot_Demo/res/values-v14/styles.xml
rename to orte/contrib/Robot_Demo/res/values-v14/styles.xml

diff --git a/orte/Robot_Demo/res/values/strings.xml b/orte/contrib/Robot_Demo/res/values/strings.xml
similarity index 100%
rename from orte/Robot_Demo/res/values/strings.xml
rename to orte/contrib/Robot_Demo/res/values/strings.xml

diff --git a/orte/Robot_Demo/res/values/styles.xml b/orte/contrib/Robot_Demo/res/values/styles.xml
similarity index 100%
rename from orte/Robot_Demo/res/values/styles.xml
rename to orte/contrib/Robot_Demo/res/values/styles.xml

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/CraneCmdType.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanSubscribe.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/HokuyoView.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdType.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedPublish.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/MotionSpeedSubscribe.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageSubscribe.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/PwrVoltageType.java

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
similarity index 100%
rename from orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
rename to orte/contrib/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java