diff options
| author | Rami Santina <[email protected]> | 2011-09-30 19:58:01 +0300 |
|---|---|---|
| committer | Rami Santina <[email protected]> | 2011-09-30 19:58:01 +0300 |
| commit | 836d4824ad20c57155d850d2b3657004b019514d (patch) | |
| tree | 7e3065788ee7959877589f4e19172f5044b0ca58 /make | |
| parent | 14ec84659f2ef5ba6c74601360adfff0558fc6f0 (diff) | |
| parent | 448ad05ea1192a1c3ca8812bf8d3142b2df6c30b (diff) | |
Merge branch 'android-tegra-playground' of git://github.com/sgothel/jogl into android-tegra-playground
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-launcher.xml | 24 | ||||
| -rw-r--r-- | make/resources/android/res-launcher/values/strings.xml | 4 | ||||
| -rwxr-xr-x | make/scripts/adb-reinstall-all.sh | 4 |
3 files changed, 32 insertions, 0 deletions
diff --git a/make/resources/android/AndroidManifest-launcher.xml b/make/resources/android/AndroidManifest-launcher.xml index d32695fb6..c77addb2e 100644 --- a/make/resources/android/AndroidManifest-launcher.xml +++ b/make/resources/android/AndroidManifest-launcher.xml @@ -13,6 +13,30 @@ 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="standard" 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> diff --git a/make/scripts/adb-reinstall-all.sh b/make/scripts/adb-reinstall-all.sh new file mode 100755 index 000000000..dcbd1c861 --- /dev/null +++ b/make/scripts/adb-reinstall-all.sh @@ -0,0 +1,4 @@ +sdir=`dirname $0` + +$sdir/adb-uninstall-all.sh +$sdir/adb-install-all.sh |