From 71fb7c1271cc1dbbcacdaf6da093055ec61835d3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 30 Sep 2011 17:07:33 +0200
Subject: Android: Use standard launch mode; Add default actions to
 NewtBaseActivity; Add RedSquare ES1 + ES2

---
 .../resources/android/AndroidManifest-launcher.xml | 32 +++++++++++++++++++---
 .../android/res-launcher/values/strings.xml        |  4 +++
 2 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'make/resources')

diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml
index cbd2063a6..176ddfb3c 100644
--- a/make/resources/android/AndroidManifest-launcher.xml
+++ b/make/resources/android/AndroidManifest-launcher.xml
@@ -13,9 +13,33 @@
                  android:description="@string/app_descr"
                  android:persistent="false"
                  >
+        <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="singleTop"
+                  android:launchMode="standard"
                   android:configChanges="keyboardHidden|orientation"
                   android:label="@string/activity_gearses1_name"
                   android:description="@string/activity_gearses1_descr"
@@ -27,7 +51,7 @@
         </activity>
         <activity android:name="com.jogamp.android.launcher.NEWTLauncherGearsES2Activity"
                   android:finishOnTaskLaunch="true"
-                  android:launchMode="singleTop"
+                  android:launchMode="standard"
                   android:configChanges="keyboardHidden|orientation"
                   android:label="@string/activity_gearses2_name"
                   android:description="@string/activity_gearses2_descr"
@@ -39,7 +63,7 @@
         </activity>
         <activity android:name="com.jogamp.android.launcher.NEWTLauncherGraphUIActivity"
                   android:finishOnTaskLaunch="true"
-                  android:launchMode="singleTop"
+                  android:launchMode="standard"
                   android:configChanges="keyboardHidden|orientation"
                   android:label="@string/activity_graphui_name"
                   android:description="@string/activity_graphui_descr"
@@ -51,7 +75,7 @@
         </activity>
         <activity android:name="com.jogamp.android.launcher.NEWTLauncherElektronActivity"
                   android:finishOnTaskLaunch="true"
-                  android:launchMode="singleTop"
+                  android:launchMode="standard"
                   android:configChanges="keyboardHidden|orientation"
                   android:label="@string/activity_elektro_name"
                   android:description="@string/activity_elektro_descr"
diff --git a/make/resources/android/res-launcher/values/strings.xml b/make/resources/android/res-launcher/values/strings.xml
index 595752728..c039d6864 100644
--- a/make/resources/android/res-launcher/values/strings.xml
+++ b/make/resources/android/res-launcher/values/strings.xml
@@ -3,6 +3,10 @@
     <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="activity_redsquarees1_name">RedSquareES1</string>
+    <string name="activity_redsquarees1_descr">RedSquareES1</string>
+    <string name="activity_redsquarees2_name">RedSquareES2</string>
+    <string name="activity_redsquarees2_descr">RedSquareES2</string>
     <string name="activity_gearses1_name">GearsES1</string>
     <string name="activity_gearses1_descr">GearsES1</string>
     <string name="activity_gearses2_name">GearsES2</string>
-- 
cgit v1.2.3