Merge branch 'master' of git://github.com/sgothel/jogl

5 files changed, 45 insertions, 2 deletions

diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml
index e48b61e45..88abc8ba5 100644
--- a/make/resources/android/AndroidManifest-launcher.xml
+++ b/make/resources/android/AndroidManifest-launcher.xml
@@ -3,6 +3,7 @@
       sharedUserId="com.jogamp.Community" 
       package="com.jogamp.android.launcher">
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- required for NV's perfhud -->
     <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" />
@@ -69,6 +70,20 @@
                 <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"
diff --git a/make/resources/android/res-launcher/values/colors.xml b/make/resources/android/res-launcher/values/colors.xml
new file mode 100644
index 000000000..f4d188b25
--- /dev/null
+++ b/make/resources/android/res-launcher/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-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml
index f4b558df3..8b6928d9c 100644
--- a/make/resources/android/res-launcher/values/strings.xml
+++ b/make/resources/android/res-launcher/values/strings.xml
@@ -11,6 +11,8 @@
     <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>
diff --git a/make/resources/android/res-launcher/values/styles.xml b/make/resources/android/res-launcher/values/styles.xml
new file mode 100644
index 000000000..5b7eb7e2e
--- /dev/null
+++ b/make/resources/android/res-launcher/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/scripts/tests.sh b/make/scripts/tests.sh
index fdba483e6..69068a23a 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -167,7 +167,7 @@ function testawtmt() {
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $*
@@ -250,7 +250,7 @@ function testawtmt() {
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $*
-testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo02 $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT $*