diff options
Diffstat (limited to 'make/resources')
-rw-r--r-- | make/resources/android/AndroidManifest-launcher.xml | 130 | ||||
-rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 83 | ||||
-rw-r--r-- | make/resources/android/res-jogl/values/colors.xml (renamed from make/resources/android/res-launcher/values/colors.xml) | 0 | ||||
-rw-r--r-- | make/resources/android/res-jogl/values/styles.xml (renamed from make/resources/android/res-launcher/values/styles.xml) | 0 | ||||
-rw-r--r-- | make/resources/android/res-test/drawable-hdpi/icon.png (renamed from make/resources/android/res-launcher/drawable-hdpi/icon.png) | bin | 2516 -> 2516 bytes | |||
-rw-r--r-- | make/resources/android/res-test/drawable-ldpi/icon.png (renamed from make/resources/android/res-launcher/drawable-ldpi/icon.png) | bin | 1172 -> 1172 bytes | |||
-rw-r--r-- | make/resources/android/res-test/drawable-mdpi/icon.png (renamed from make/resources/android/res-launcher/drawable-mdpi/icon.png) | bin | 1570 -> 1570 bytes | |||
-rw-r--r-- | make/resources/android/res-test/layout/main.xml (renamed from make/resources/android/res-launcher/layout/main.xml) | 0 | ||||
-rw-r--r-- | make/resources/android/res-test/values/strings.xml (renamed from make/resources/android/res-launcher/values/strings.xml) | 6 |
9 files changed, 86 insertions, 133 deletions
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-launcher/values/colors.xml b/make/resources/android/res-jogl/values/colors.xml index f4d188b25..f4d188b25 100644 --- a/make/resources/android/res-launcher/values/colors.xml +++ b/make/resources/android/res-jogl/values/colors.xml diff --git a/make/resources/android/res-launcher/values/styles.xml b/make/resources/android/res-jogl/values/styles.xml index 5b7eb7e2e..5b7eb7e2e 100644 --- a/make/resources/android/res-launcher/values/styles.xml +++ b/make/resources/android/res-jogl/values/styles.xml diff --git a/make/resources/android/res-launcher/drawable-hdpi/icon.png b/make/resources/android/res-test/drawable-hdpi/icon.png Binary files differindex 2148232c9..2148232c9 100644 --- a/make/resources/android/res-launcher/drawable-hdpi/icon.png +++ b/make/resources/android/res-test/drawable-hdpi/icon.png diff --git a/make/resources/android/res-launcher/drawable-ldpi/icon.png b/make/resources/android/res-test/drawable-ldpi/icon.png Binary files differindex c16211f36..c16211f36 100644 --- a/make/resources/android/res-launcher/drawable-ldpi/icon.png +++ b/make/resources/android/res-test/drawable-ldpi/icon.png diff --git a/make/resources/android/res-launcher/drawable-mdpi/icon.png b/make/resources/android/res-test/drawable-mdpi/icon.png Binary files differindex 1c26e3f83..1c26e3f83 100644 --- a/make/resources/android/res-launcher/drawable-mdpi/icon.png +++ b/make/resources/android/res-test/drawable-mdpi/icon.png diff --git a/make/resources/android/res-launcher/layout/main.xml b/make/resources/android/res-test/layout/main.xml index 3a5f117d3..3a5f117d3 100644 --- a/make/resources/android/res-launcher/layout/main.xml +++ b/make/resources/android/res-test/layout/main.xml diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-test/values/strings.xml index 8b6928d9c..d66f6e4d7 100644 --- a/make/resources/android/res-launcher/values/strings.xml +++ b/make/resources/android/res-test/values/strings.xml @@ -1,8 +1,8 @@ <?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="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> |