From a40e22a58e0c71a95f11b7c7e83247fbd4a4d94f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 14 Mar 2012 23:17:35 +0100
Subject: Android Tests: Using JogAmp's ActivityLauncher (gluegen commit:
 0cfc7847c58b51c9a26b50d905b592d1fc4c8578)

- Remove jogl.android-launcher.apk in favor of generic jogamp.android-launcher.apk

- All Android test code resides in jogl.test.apk (initial launcher and delegated 'real' one)
---
 .../resources/android/AndroidManifest-launcher.xml | 130 ---------------------
 make/resources/android/AndroidManifest-test.xml    |  83 +++++++++++++
 make/resources/android/res-jogl/values/colors.xml  |   6 +
 make/resources/android/res-jogl/values/styles.xml  |  20 ++++
 .../android/res-launcher/drawable-hdpi/icon.png    | Bin 2516 -> 0 bytes
 .../android/res-launcher/drawable-ldpi/icon.png    | Bin 1172 -> 0 bytes
 .../android/res-launcher/drawable-mdpi/icon.png    | Bin 1570 -> 0 bytes
 .../resources/android/res-launcher/layout/main.xml |  12 --
 .../android/res-launcher/values/colors.xml         |   6 -
 .../android/res-launcher/values/strings.xml        |  22 ----
 .../android/res-launcher/values/styles.xml         |  20 ----
 .../android/res-test/drawable-hdpi/icon.png        | Bin 0 -> 2516 bytes
 .../android/res-test/drawable-ldpi/icon.png        | Bin 0 -> 1172 bytes
 .../android/res-test/drawable-mdpi/icon.png        | Bin 0 -> 1570 bytes
 make/resources/android/res-test/layout/main.xml    |  12 ++
 make/resources/android/res-test/values/strings.xml |  22 ++++
 16 files changed, 143 insertions(+), 190 deletions(-)
 delete mode 100644 make/resources/android/AndroidManifest-launcher.xml
 create mode 100644 make/resources/android/res-jogl/values/colors.xml
 create mode 100644 make/resources/android/res-jogl/values/styles.xml
 delete mode 100644 make/resources/android/res-launcher/drawable-hdpi/icon.png
 delete mode 100644 make/resources/android/res-launcher/drawable-ldpi/icon.png
 delete mode 100644 make/resources/android/res-launcher/drawable-mdpi/icon.png
 delete mode 100644 make/resources/android/res-launcher/layout/main.xml
 delete mode 100644 make/resources/android/res-launcher/values/colors.xml
 delete mode 100644 make/resources/android/res-launcher/values/strings.xml
 delete mode 100644 make/resources/android/res-launcher/values/styles.xml
 create mode 100644 make/resources/android/res-test/drawable-hdpi/icon.png
 create mode 100644 make/resources/android/res-test/drawable-ldpi/icon.png
 create mode 100644 make/resources/android/res-test/drawable-mdpi/icon.png
 create mode 100644 make/resources/android/res-test/layout/main.xml
 create mode 100644 make/resources/android/res-test/values/strings.xml

(limited to 'make/resources')

diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml
deleted file mode 100644
index dda42b4fd..000000000
--- a/make/resources/android/AndroidManifest-launcher.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      sharedUserId="com.jogamp.Community" 
-      package="com.jogamp.android.launcher">
-
-    <uses-permission android:name="android.permission.INTERNET" /> <!-- required for NV's perfhud -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- required for Android trace -->
-
-    <uses-sdk android:minSdkVersion="9" />
-    <uses-library android:name="com.jogamp.common" android:required="true" />
-    <uses-library android:name="javax.media.opengl" android:required="true" />
-    <uses-library android:name="com.jogamp.opengl.test" android:required="true" />
-
-    <application android:icon="@drawable/icon" 
-                 android:label="@string/app_name"
-                 android:description="@string/app_descr"
-                 android:persistent="false"
-                 >
-
-        <!-- We use activities with ES1 and ES2,
-             also setting the feature tag didn't fix the tegra issue.
-             Leave it here for documentation, maybe later use.
-		<uses-feature android:glEsVersion="0x00020000" />
-           -->
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherRedSquareES1Activity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_redsquarees1_name"
-                  android:description="@string/activity_redsquarees1_descr"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherRedSquareES2Activity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_redsquarees2_name"
-                  android:description="@string/activity_redsquarees2_descr"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGearsES1Activity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_gearses1_name"
-                  android:description="@string/activity_gearses1_descr"
-                  android:exported="true"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGearsES2Activity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_gearses2_name"
-                  android:description="@string/activity_gearses2_descr"
-                  android:exported="true"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGearsES2TransActivity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_gearses2t_name"
-                  android:description="@string/activity_gearses2t_descr"
-                  android:exported="true"
-                  android:theme="@style/Theme.Transparent"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGraphUI1pActivity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_graphui1p_name"
-                  android:description="@string/activity_graphui1p_descr"
-                  android:exported="true"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherGraphUI2pActivity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_graphui2p_name"
-                  android:description="@string/activity_graphui2p_descr"
-                  android:exported="true"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.jogamp.android.launcher.NEWTLauncherElektronActivity"
-                  android:finishOnTaskLaunch="true"
-                  android:launchMode="standard"
-                  android:configChanges="keyboardHidden|orientation"
-                  android:label="@string/activity_elektro_name"
-                  android:description="@string/activity_elektro_descr"
-                  android:exported="true"
-                  >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml
index 80539cf26..ca3089098 100644
--- a/make/resources/android/AndroidManifest-test.xml
+++ b/make/resources/android/AndroidManifest-test.xml
@@ -12,6 +12,89 @@
                  android:description="@string/app_descr"
                  android:persistent="false"
                  >
+
+        <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.NEWTRedSquareES2ActivityLauncher"
+                  android:label="@string/activity_redsquarees2_name"
+                  android:description="@string/activity_redsquarees2_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.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.NEWTGearsES2ActivityLauncher"
+                  android:label="@string/activity_gearses2_name"
+                  android:description="@string/activity_gearses2_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"
+                  android:label="@string/activity_gearses2t_name"
+                  android:description="@string/activity_gearses2t_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.NEWTGraphUI1pActivityLauncher"
+                  android:label="@string/activity_graphui1p_name"
+                  android:description="@string/activity_graphui1p_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.NEWTGraphUI2pActivityLauncher"
+                  android:label="@string/activity_graphui2p_name"
+                  android:description="@string/activity_graphui2p_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.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>
     </application>
 
 </manifest>
diff --git a/make/resources/android/res-jogl/values/colors.xml b/make/resources/android/res-jogl/values/colors.xml
new file mode 100644
index 000000000..f4d188b25
--- /dev/null
+++ b/make/resources/android/res-jogl/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<drawable name="screen_background_black">#ff000000</drawable>
+    <drawable name="translucent_background">#e0000000</drawable>
+    <drawable name="transparent_background">#00000000</drawable>
+</resources>
diff --git a/make/resources/android/res-jogl/values/styles.xml b/make/resources/android/res-jogl/values/styles.xml
new file mode 100644
index 000000000..5b7eb7e2e
--- /dev/null
+++ b/make/resources/android/res-jogl/values/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme" parent="android:Theme">
+    </style>
+
+    <style name="Theme.Translucent" parent="android:style/Theme.Translucent">
+        <item name="android:windowBackground">@drawable/translucent_background</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:colorForeground">#fff</item>
+    </style>
+
+    <style name="Theme.Transparent">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+        <item name="android:windowBackground">@drawable/transparent_background</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:colorForeground">#fff</item>
+    </style>
+
+</resources>
diff --git a/make/resources/android/res-launcher/drawable-hdpi/icon.png b/make/resources/android/res-launcher/drawable-hdpi/icon.png
deleted file mode 100644
index 2148232c9..000000000
Binary files a/make/resources/android/res-launcher/drawable-hdpi/icon.png and /dev/null differ
diff --git a/make/resources/android/res-launcher/drawable-ldpi/icon.png b/make/resources/android/res-launcher/drawable-ldpi/icon.png
deleted file mode 100644
index c16211f36..000000000
Binary files a/make/resources/android/res-launcher/drawable-ldpi/icon.png and /dev/null differ
diff --git a/make/resources/android/res-launcher/drawable-mdpi/icon.png b/make/resources/android/res-launcher/drawable-mdpi/icon.png
deleted file mode 100644
index 1c26e3f83..000000000
Binary files a/make/resources/android/res-launcher/drawable-mdpi/icon.png and /dev/null differ
diff --git a/make/resources/android/res-launcher/layout/main.xml b/make/resources/android/res-launcher/layout/main.xml
deleted file mode 100644
index 3a5f117d3..000000000
--- a/make/resources/android/res-launcher/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/hello"
-    />
-</LinearLayout>
diff --git a/make/resources/android/res-launcher/values/colors.xml b/make/resources/android/res-launcher/values/colors.xml
deleted file mode 100644
index f4d188b25..000000000
--- a/make/resources/android/res-launcher/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<drawable name="screen_background_black">#ff000000</drawable>
-    <drawable name="translucent_background">#e0000000</drawable>
-    <drawable name="transparent_background">#00000000</drawable>
-</resources>
diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml
deleted file mode 100644
index 8b6928d9c..000000000
--- a/make/resources/android/res-launcher/values/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hello">Jogl Launcher</string>
-    <string name="app_name">JogAmp\'s Jogl Launcher</string>
-    <string name="app_descr">Launches Jogl Applications.</string>
-    <string name="activity_redsquarees1_name">RedSqrES1</string>
-    <string name="activity_redsquarees1_descr">RedSquareES1</string>
-    <string name="activity_redsquarees2_name">RedSqrES2</string>
-    <string name="activity_redsquarees2_descr">RedSquareES2</string>
-    <string name="activity_gearses1_name">GearsES1</string>
-    <string name="activity_gearses1_descr">GearsES1</string>
-    <string name="activity_gearses2_name">GearsES2</string>
-    <string name="activity_gearses2_descr">GearsES2</string>
-    <string name="activity_gearses2t_name">GearsES2T</string>
-    <string name="activity_gearses2t_descr">GearsES2T</string>
-    <string name="activity_graphui1p_name">GraphUI1p</string>
-    <string name="activity_graphui1p_descr">GraphUI 1-pass</string>
-    <string name="activity_graphui2p_name">GraphUI2p</string>
-    <string name="activity_graphui2p_descr">GraphUI 2-pass</string>
-    <string name="activity_elektro_name">Elektro</string>
-    <string name="activity_elektro_descr">Elektro</string>
-</resources>
diff --git a/make/resources/android/res-launcher/values/styles.xml b/make/resources/android/res-launcher/values/styles.xml
deleted file mode 100644
index 5b7eb7e2e..000000000
--- a/make/resources/android/res-launcher/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme" parent="android:Theme">
-    </style>
-
-    <style name="Theme.Translucent" parent="android:style/Theme.Translucent">
-        <item name="android:windowBackground">@drawable/translucent_background</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:colorForeground">#fff</item>
-    </style>
-
-    <style name="Theme.Transparent">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
-        <item name="android:windowBackground">@drawable/transparent_background</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:colorForeground">#fff</item>
-    </style>
-
-</resources>
diff --git a/make/resources/android/res-test/drawable-hdpi/icon.png b/make/resources/android/res-test/drawable-hdpi/icon.png
new file mode 100644
index 000000000..2148232c9
Binary files /dev/null and b/make/resources/android/res-test/drawable-hdpi/icon.png differ
diff --git a/make/resources/android/res-test/drawable-ldpi/icon.png b/make/resources/android/res-test/drawable-ldpi/icon.png
new file mode 100644
index 000000000..c16211f36
Binary files /dev/null and b/make/resources/android/res-test/drawable-ldpi/icon.png differ
diff --git a/make/resources/android/res-test/drawable-mdpi/icon.png b/make/resources/android/res-test/drawable-mdpi/icon.png
new file mode 100644
index 000000000..1c26e3f83
Binary files /dev/null and b/make/resources/android/res-test/drawable-mdpi/icon.png differ
diff --git a/make/resources/android/res-test/layout/main.xml b/make/resources/android/res-test/layout/main.xml
new file mode 100644
index 000000000..3a5f117d3
--- /dev/null
+++ b/make/resources/android/res-test/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml
new file mode 100644
index 000000000..d66f6e4d7
--- /dev/null
+++ b/make/resources/android/res-test/values/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Jogl Tests</string>
+    <string name="app_name">Jogl Tests</string>
+    <string name="app_descr">Launches Jogl Tests.</string>
+    <string name="activity_redsquarees1_name">RedSqrES1</string>
+    <string name="activity_redsquarees1_descr">RedSquareES1</string>
+    <string name="activity_redsquarees2_name">RedSqrES2</string>
+    <string name="activity_redsquarees2_descr">RedSquareES2</string>
+    <string name="activity_gearses1_name">GearsES1</string>
+    <string name="activity_gearses1_descr">GearsES1</string>
+    <string name="activity_gearses2_name">GearsES2</string>
+    <string name="activity_gearses2_descr">GearsES2</string>
+    <string name="activity_gearses2t_name">GearsES2T</string>
+    <string name="activity_gearses2t_descr">GearsES2T</string>
+    <string name="activity_graphui1p_name">GraphUI1p</string>
+    <string name="activity_graphui1p_descr">GraphUI 1-pass</string>
+    <string name="activity_graphui2p_name">GraphUI2p</string>
+    <string name="activity_graphui2p_descr">GraphUI 2-pass</string>
+    <string name="activity_elektro_name">Elektro</string>
+    <string name="activity_elektro_descr">Elektro</string>
+</resources>
-- 
cgit v1.2.3