diff options
| author | Sven Gothel <[email protected]> | 2012-04-06 03:45:38 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-04-06 03:45:38 +0200 |
| commit | aeeddc61cd50742ad2bceb2ce91c707ddfb69d88 (patch) | |
| tree | 7bc18e45fbb4e2814ed68d58fb50b0ff61358190 /make | |
| parent | 9d1ee2b69fc943559a17dcd5d59984f8bba15296 (diff) | |
Android MovieSimple Split: zoom and orig size for performance analysis
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 30 | ||||
| -rw-r--r-- | make/resources/android/res-test/values/strings.xml | 8 |
2 files changed, 30 insertions, 8 deletions
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index 95141855b..c8779cda9 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -95,8 +95,8 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00" - android:label="@string/activity_moviesimple00_name" + <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00a" + android:label="@string/activity_moviesimple0a_name" android:description="@string/activity_moviesimple_descr" android:theme="@android:style/Theme.NoDisplay" > @@ -105,8 +105,28 @@ <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" + <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher00b" + android:label="@string/activity_moviesimple0b_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.MovieSimpleActivityLauncher01a" + android:label="@string/activity_moviesimple1a_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.MovieSimpleActivityLauncher01b" + android:label="@string/activity_moviesimple1b_name" android:description="@string/activity_moviesimple_descr" android:theme="@android:style/Theme.NoDisplay" > @@ -116,7 +136,7 @@ </intent-filter> </activity> <activity android:name="com.jogamp.opengl.test.android.MovieSimpleActivityLauncher02" - android:label="@string/activity_moviesimple02_name" + android:label="@string/activity_moviesimple2_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 175aed014..5f41a1be7 100644 --- a/make/resources/android/res-test/values/strings.xml +++ b/make/resources/android/res-test/values/strings.xml @@ -19,8 +19,10 @@ <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_moviesimple00_name">MovieSimple0</string> - <string name="activity_moviesimple01_name">MovieSimple1</string> - <string name="activity_moviesimple02_name">MovieSimple2</string> + <string name="activity_moviesimple0a_name">MovieSimple0a</string> + <string name="activity_moviesimple0b_name">MovieSimple0b</string> + <string name="activity_moviesimple1a_name">MovieSimple1a</string> + <string name="activity_moviesimple1b_name">MovieSimple1b</string> + <string name="activity_moviesimple2_name">MovieSimple2</string> <string name="activity_moviesimple_descr">MovieSimple</string> </resources> |