Android/Demos: Add ElektronenMultiplizierer (fix shader and keylistener add/remove)

5 files changed, 19 insertions, 5 deletions

diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml
index a69e6f865..cbd2063a6 100644
--- a/make/resources/android/AndroidManifest-launcher.xml
+++ b/make/resources/android/AndroidManifest-launcher.xml
@@ -49,6 +49,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="com.jogamp.android.launcher.NEWTLauncherElektronActivity"
+                  android:finishOnTaskLaunch="true"
+                  android:launchMode="singleTop"
+                  android:configChanges="keyboardHidden|orientation"
+                  android:label="@string/activity_elektro_name"
+                  android:description="@string/activity_elektro_descr"
+                  >
+            <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-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml
index e9bb75b65..595752728 100644
--- a/make/resources/android/res-launcher/values/strings.xml
+++ b/make/resources/android/res-launcher/values/strings.xml
@@ -9,4 +9,6 @@
     <string name="activity_gearses2_descr">GearsES2</string>
     <string name="activity_graphui_name">GraphUI</string>
     <string name="activity_graphui_descr">GraphUI</string>
+    <string name="activity_elektro_name">Elektro</string>
+    <string name="activity_elektro_descr">Elektro</string>
 </resources>
diff --git a/make/scripts/adb-install-all.sh b/make/scripts/adb-install-all.sh
index e266ae22d..ac18a84ed 100644..100755
--- a/make/scripts/adb-install-all.sh
+++ b/make/scripts/adb-install-all.sh
@@ -1,4 +1,4 @@
-adb install ../../gluegen/build-android-armv7/gluegen-rt.apk
+#adb install ../../gluegen/build-android-armv7/gluegen-rt.apk
 adb install ../build-android-armv7/jar/jogl.all-android.apk
 adb install ../build-android-armv7/jar/jogl.android-launcher.apk
 adb install ../build-android-armv7/jar/jogl.test.apk
diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh
index db079fcf0..059b1d5aa 100644..100755
--- a/make/scripts/adb-uninstall-all.sh
+++ b/make/scripts/adb-uninstall-all.sh
@@ -1,4 +1,4 @@
-adb uninstall com.jogamp.common
+#adb uninstall com.jogamp.common
 adb uninstall javax.media.opengl
 adb uninstall com.jogamp.android.launcher
 adb uninstall com.jogamp.opengl.test
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index a3e8c92f3..2182ad0dd 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -69,7 +69,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GraphicsConfiguration"
     #D_ARGS="-Dnewt.debug.EDT"
     #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all"
-    D_ARGS="-Djogl.debug=all -Dnewt.debug=all"
+    #D_ARGS="-Djogl.debug=all -Dnewt.debug=all"
     #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext"
     #D_ARGS="-Dnewt.debug.Window -Djogl.debug.Animator -Dnewt.debug.Screen"
     #D_ARGS="-Dnewt.debug.Window"
@@ -246,11 +246,11 @@ 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.jogl.acore.TestGPUMemSec01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
 
 #
 # regressions