From a40e22a58e0c71a95f11b7c7e83247fbd4a4d94f Mon Sep 17 00:00:00 2001 From: Sven Gothel 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 --------------------- make/resources/android/AndroidManifest-test.xml | 83 +++++++++++++ make/resources/android/res-jogl/values/colors.xml | 6 + make/resources/android/res-jogl/values/styles.xml | 20 ++++ .../android/res-launcher/drawable-hdpi/icon.png | Bin 2516 -> 0 bytes .../android/res-launcher/drawable-ldpi/icon.png | Bin 1172 -> 0 bytes .../android/res-launcher/drawable-mdpi/icon.png | Bin 1570 -> 0 bytes .../resources/android/res-launcher/layout/main.xml | 12 -- .../android/res-launcher/values/colors.xml | 6 - .../android/res-launcher/values/strings.xml | 22 ---- .../android/res-launcher/values/styles.xml | 20 ---- .../android/res-test/drawable-hdpi/icon.png | Bin 0 -> 2516 bytes .../android/res-test/drawable-ldpi/icon.png | Bin 0 -> 1172 bytes .../android/res-test/drawable-mdpi/icon.png | Bin 0 -> 1570 bytes make/resources/android/res-test/layout/main.xml | 12 ++ make/resources/android/res-test/values/strings.xml | 22 ++++ 16 files changed, 143 insertions(+), 190 deletions(-) delete mode 100644 make/resources/android/AndroidManifest-launcher.xml create mode 100644 make/resources/android/res-jogl/values/colors.xml create mode 100644 make/resources/android/res-jogl/values/styles.xml delete mode 100644 make/resources/android/res-launcher/drawable-hdpi/icon.png delete mode 100644 make/resources/android/res-launcher/drawable-ldpi/icon.png delete mode 100644 make/resources/android/res-launcher/drawable-mdpi/icon.png delete mode 100644 make/resources/android/res-launcher/layout/main.xml delete mode 100644 make/resources/android/res-launcher/values/colors.xml delete mode 100644 make/resources/android/res-launcher/values/strings.xml delete mode 100644 make/resources/android/res-launcher/values/styles.xml create mode 100644 make/resources/android/res-test/drawable-hdpi/icon.png create mode 100644 make/resources/android/res-test/drawable-ldpi/icon.png create mode 100644 make/resources/android/res-test/drawable-mdpi/icon.png create mode 100644 make/resources/android/res-test/layout/main.xml create mode 100644 make/resources/android/res-test/values/strings.xml (limited to 'make/resources') 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/make/resources/android/res-jogl/values/colors.xml b/make/resources/android/res-jogl/values/colors.xml new file mode 100644 index 000000000..f4d188b25 --- /dev/null +++ b/make/resources/android/res-jogl/values/colors.xml @@ -0,0 +1,6 @@ + + + #ff000000 + #e0000000 + #00000000 + diff --git a/make/resources/android/res-jogl/values/styles.xml b/make/resources/android/res-jogl/values/styles.xml new file mode 100644 index 000000000..5b7eb7e2e --- /dev/null +++ b/make/resources/android/res-jogl/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/make/resources/android/res-launcher/drawable-hdpi/icon.png b/make/resources/android/res-launcher/drawable-hdpi/icon.png deleted file mode 100644 index 2148232c9..000000000 Binary files a/make/resources/android/res-launcher/drawable-hdpi/icon.png and /dev/null differ diff --git a/make/resources/android/res-launcher/drawable-ldpi/icon.png b/make/resources/android/res-launcher/drawable-ldpi/icon.png deleted file mode 100644 index c16211f36..000000000 Binary files a/make/resources/android/res-launcher/drawable-ldpi/icon.png and /dev/null differ diff --git a/make/resources/android/res-launcher/drawable-mdpi/icon.png b/make/resources/android/res-launcher/drawable-mdpi/icon.png deleted file mode 100644 index 1c26e3f83..000000000 Binary files a/make/resources/android/res-launcher/drawable-mdpi/icon.png and /dev/null differ diff --git a/make/resources/android/res-launcher/layout/main.xml b/make/resources/android/res-launcher/layout/main.xml deleted file mode 100644 index 3a5f117d3..000000000 --- a/make/resources/android/res-launcher/layout/main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/make/resources/android/res-launcher/values/colors.xml b/make/resources/android/res-launcher/values/colors.xml deleted file mode 100644 index f4d188b25..000000000 --- a/make/resources/android/res-launcher/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #ff000000 - #e0000000 - #00000000 - diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml deleted file mode 100644 index 8b6928d9c..000000000 --- a/make/resources/android/res-launcher/values/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - Jogl Launcher - JogAmp\'s Jogl Launcher - Launches Jogl Applications. - RedSqrES1 - RedSquareES1 - RedSqrES2 - RedSquareES2 - GearsES1 - GearsES1 - GearsES2 - GearsES2 - GearsES2T - GearsES2T - GraphUI1p - GraphUI 1-pass - GraphUI2p - GraphUI 2-pass - Elektro - Elektro - diff --git a/make/resources/android/res-launcher/values/styles.xml b/make/resources/android/res-launcher/values/styles.xml deleted file mode 100644 index 5b7eb7e2e..000000000 --- a/make/resources/android/res-launcher/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/make/resources/android/res-test/drawable-hdpi/icon.png b/make/resources/android/res-test/drawable-hdpi/icon.png new file mode 100644 index 000000000..2148232c9 Binary files /dev/null and b/make/resources/android/res-test/drawable-hdpi/icon.png differ diff --git a/make/resources/android/res-test/drawable-ldpi/icon.png b/make/resources/android/res-test/drawable-ldpi/icon.png new file mode 100644 index 000000000..c16211f36 Binary files /dev/null and b/make/resources/android/res-test/drawable-ldpi/icon.png differ diff --git a/make/resources/android/res-test/drawable-mdpi/icon.png b/make/resources/android/res-test/drawable-mdpi/icon.png new file mode 100644 index 000000000..1c26e3f83 Binary files /dev/null and b/make/resources/android/res-test/drawable-mdpi/icon.png differ diff --git a/make/resources/android/res-test/layout/main.xml b/make/resources/android/res-test/layout/main.xml new file mode 100644 index 000000000..3a5f117d3 --- /dev/null +++ b/make/resources/android/res-test/layout/main.xml @@ -0,0 +1,12 @@ + + + + diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml new file mode 100644 index 000000000..d66f6e4d7 --- /dev/null +++ b/make/resources/android/res-test/values/strings.xml @@ -0,0 +1,22 @@ + + + Jogl Tests + Jogl Tests + Launches Jogl Tests. + RedSqrES1 + RedSquareES1 + RedSqrES2 + RedSquareES2 + GearsES1 + GearsES1 + GearsES2 + GearsES2 + GearsES2T + GearsES2T + GraphUI1p + GraphUI 1-pass + GraphUI2p + GraphUI 2-pass + Elektro + Elektro + -- cgit v1.2.3