diff options
| author | Sven Gothel <[email protected]> | 2012-04-04 06:15:05 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-04-04 06:15:05 +0200 |
| commit | 74c6486a5eb40b760b500e836f4e4ffec8cb1ce5 (patch) | |
| tree | 4aa64a004a551c805906b2ac3c85543f12f7bc25 /make | |
| parent | 9e680fe86cd5b64aa758ce32666a6efa19118d3d (diff) | |
Split Android MovieSimple Launcher to 3
00: One movie view, centered, no effects
01: Two movie views (Main + HUD) using same GLMediaPlayer [texture] and stream
02: Two movie views (Main + HUD) each using own GLMediaPlayer and stream
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 24 | ||||
| -rw-r--r-- | make/resources/android/res-test/values/strings.xml | 4 |
2 files changed, 25 insertions, 3 deletions
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index 84256f6f4..95141855b 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -95,8 +95,28 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher" - android:label="@string/activity_moviesimple_name" + <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00" + android:label="@string/activity_moviesimple00_name" + android:description="@string/activity_moviesimple_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.MovieSimpleActivityLauncher01" + android:label="@string/activity_moviesimple01_name" + android:description="@string/activity_moviesimple_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.MovieSimpleActivityLauncher02" + android:label="@string/activity_moviesimple02_name" android:description="@string/activity_moviesimple_descr" android:theme="@android:style/Theme.NoDisplay" > diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml index ea366a9f9..175aed014 100644 --- a/make/resources/android/res-test/values/strings.xml +++ b/make/resources/android/res-test/values/strings.xml @@ -19,6 +19,8 @@ <string name="activity_graphui2p_descr">GraphUI 2-pass</string> <string name="activity_elektro_name">Elektro</string> <string name="activity_elektro_descr">Elektro</string> - <string name="activity_moviesimple_name">MovieSimple</string> + <string name="activity_moviesimple00_name">MovieSimple0</string> + <string name="activity_moviesimple01_name">MovieSimple1</string> + <string name="activity_moviesimple02_name">MovieSimple2</string> <string name="activity_moviesimple_descr">MovieSimple</string> </resources> |