diff options
| author | Sven Gothel <[email protected]> | 2014-03-25 23:55:39 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-03-25 23:55:39 +0100 |
| commit | 38febaa43f91e389ffdaf64a2cdd8145629e0b8d (patch) | |
| tree | 9adb504527dcef76a10660c854cb658a0be58ff3 /make/resources | |
| parent | b078f74cc707e7fc962efde08ab5d9cc6667e27c (diff) | |
Bug 801: Adjust Tests: GPUUIScene* use window proportional button size; Add Android MovieCubeActivity0a for 'no text' version
Diffstat (limited to 'make/resources')
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 14 | ||||
| -rw-r--r-- | make/resources/android/res-test/values/strings.xml | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index 0251eb505..916f34e05 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -171,8 +171,18 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0" - android:label="@string/activity_moviecube0_name" + <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a" + android:label="@string/activity_moviecube0a_name" + android:description="@string/activity_moviecube_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.MovieCubeActivityLauncher0b" + android:label="@string/activity_moviecube0b_name" android:description="@string/activity_moviecube_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 072cf47e6..0d9acaadb 100644 --- a/make/resources/android/res-test/values/strings.xml +++ b/make/resources/android/res-test/values/strings.xml @@ -29,7 +29,8 @@ <string name="activity_moviesimple1b_name">MovieSimple1b</string> <string name="activity_moviesimple2_name">MovieSimple2</string> <string name="activity_moviesimple_descr">MovieSimple</string> - <string name="activity_moviecube0_name">MovieCube0</string> + <string name="activity_moviecube0a_name">MovieCube0</string> + <string name="activity_moviecube0b_name">MovieCube1</string> <string name="activity_moviecube1a_name">CamCube0</string> <string name="activity_moviecube1b_name">CamCube1</string> <string name="activity_moviecube_descr">MovieCube</string> |