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 ---------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 make/resources/android/AndroidManifest-launcher.xml

(limited to 'make/resources/android/AndroidManifest-launcher.xml')

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>
-- 
cgit v1.2.3