Cleanup Demos: Move demos to jogl-demos.jar (here Graph + AudioVideo), ready for easy deployment and test w/ junit/ant

7 files changed, 17 insertions, 47 deletions

diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-demo.xml
index dc500e794..8757b7cc3 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       sharedUserId="com.jogamp.Community" 
-      package="com.jogamp.opengl.test">
+      package="com.jogamp.opengl.demos">
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.hardware.camera" android:required="false" />
@@ -19,7 +19,7 @@
                  android:persistent="false"
                  >
 
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2ActivityLauncher"
                   android:label="@string/activity_gearses2_name"
                   android:description="@string/activity_gearses2_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -29,7 +29,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2RGB565ActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2RGB565ActivityLauncher"
                   android:label="@string/activity_gearses2rgb565_name"
                   android:description="@string/activity_gearses2rgb565_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -39,7 +39,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2ECTActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2ECTActivityLauncher"
                   android:label="@string/activity_gearses2ect_name"
                   android:description="@string/activity_gearses2ect_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -49,18 +49,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES1ActivityLauncher"
-                  android:label="@string/activity_gearses1_name"
-                  android:description="@string/activity_gearses1_descr"
-                  android:theme="@android:style/Theme.NoDisplay"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
 
-        <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES2ActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTRedSquareES2ActivityLauncher"
                   android:label="@string/activity_redsquarees2_name"
                   android:description="@string/activity_redsquarees2_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -70,18 +60,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTRedSquareES1ActivityLauncher"
-                  android:label="@string/activity_redsquarees1_name"
-                  android:description="@string/activity_redsquarees1_descr"
-                  android:theme="@android:style/Theme.NoDisplay"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
 
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGearsES2TransActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTGearsES2TransActivityLauncher"
                   android:label="@string/activity_gearses2t_name"
                   android:description="@string/activity_gearses2t_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -91,7 +71,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGraphUI1pActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTGraphUI1pActivityLauncher"
                   android:label="@string/activity_graphui1p_name"
                   android:description="@string/activity_graphui1p_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -101,7 +81,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTGraphUI2pActivityLauncher"
+        <activity android:name="com.jogamp.opengl.demos.android.NEWTGraphUI2pActivityLauncher"
                   android:label="@string/activity_graphui2p_name"
                   android:description="@string/activity_graphui2p_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -111,17 +91,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.NEWTElektronActivityLauncher"
-                  android:label="@string/activity_elektro_name"
-                  android:description="@string/activity_elektro_descr"
-                  android:theme="@android:style/Theme.NoDisplay"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher00b"
                   android:label="@string/activity_moviesimple0b_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -131,7 +101,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00c"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher00c"
                   android:label="@string/activity_moviesimple0c_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -141,7 +111,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher01a"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher01a"
                   android:label="@string/activity_moviesimple1a_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -151,7 +121,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher01b"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher01b"
                   android:label="@string/activity_moviesimple1b_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -161,7 +131,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher02"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieSimpleActivityLauncher02"
                   android:label="@string/activity_moviesimple2_name"
                   android:description="@string/activity_moviesimple_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -171,7 +141,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher0a"
                   android:label="@string/activity_moviecube0a_name"
                   android:description="@string/activity_moviecube_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -181,7 +151,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0b"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher0b"
                   android:label="@string/activity_moviecube0b_name"
                   android:description="@string/activity_moviecube_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -191,7 +161,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1a"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher1a"
                   android:label="@string/activity_moviecube1a_name"
                   android:description="@string/activity_moviecube_descr"
                   android:theme="@android:style/Theme.NoDisplay"
@@ -201,7 +171,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher1b"
+        <activity android:name="com.jogamp.opengl.demos.android.MovieCubeActivityLauncher1b"
                   android:label="@string/activity_moviecube1b_name"
                   android:description="@string/activity_moviecube_descr"
                   android:theme="@android:style/Theme.NoDisplay"
diff --git a/make/resources/android/res-test/drawable-hdpi/icon.png b/make/resources/android/res-demo/drawable-hdpi/icon.png
index 2148232c9..2148232c9 100644
--- a/make/resources/android/res-test/drawable-hdpi/icon.png
+++ b/make/resources/android/res-demo/drawable-hdpi/icon.png
diff --git a/make/resources/android/res-test/drawable-ldpi/icon.png b/make/resources/android/res-demo/drawable-ldpi/icon.png
index c16211f36..c16211f36 100644
--- a/make/resources/android/res-test/drawable-ldpi/icon.png
+++ b/make/resources/android/res-demo/drawable-ldpi/icon.png
diff --git a/make/resources/android/res-test/drawable-mdpi/icon.png b/make/resources/android/res-demo/drawable-mdpi/icon.png
index 1c26e3f83..1c26e3f83 100644
--- a/make/resources/android/res-test/drawable-mdpi/icon.png
+++ b/make/resources/android/res-demo/drawable-mdpi/icon.png
diff --git a/make/resources/android/res-test/drawable-xhdpi/icon.png b/make/resources/android/res-demo/drawable-xhdpi/icon.png
index 7e9d5ba83..7e9d5ba83 100644
--- a/make/resources/android/res-test/drawable-xhdpi/icon.png
+++ b/make/resources/android/res-demo/drawable-xhdpi/icon.png
diff --git a/make/resources/android/res-test/layout/main.xml b/make/resources/android/res-demo/layout/main.xml
index 3a5f117d3..3a5f117d3 100644
--- a/make/resources/android/res-test/layout/main.xml
+++ b/make/resources/android/res-demo/layout/main.xml
diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-demo/values/strings.xml
index 0d9acaadb..0d9acaadb 100644
--- a/make/resources/android/res-test/values/strings.xml
+++ b/make/resources/android/res-demo/values/strings.xml