SDL2 Test updates

changeAppSettings.sh

@@ -819,13 +819,13 @@ for F in *.java; do
 	echo '// DO NOT EDIT THIS FILE - it is automatically generated, ALL YOUR CHANGES WILL BE OVERWRITTEN, edit the file under $JAVA_SRC_PATH dir' | cat - $F > ../src/$F
 done
 
+if [ -e ../jni/application/src/java.diff ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.diff || exit 1 ; fi
+if [ -e ../jni/application/src/java.patch ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.patch || exit 1 ; fi
+if ls ../jni/application/src/*.java > /dev/null 2>&1; then cp -f ../jni/application/src/*.java ../src ; fi
+
 if [ "$LibSdlVersion" = "2.0" ] ; then
 	echo Patching java with SDL 2.0 not supported
 else
-  if [ -e ../jni/application/src/java.diff ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.diff || exit 1 ; fi
-   if [ -e ../jni/application/src/java.patch ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.patch || exit 1 ; fi
-   if ls ../jni/application/src/*.java > /dev/null 2>&1; then cp -f ../jni/application/src/*.java ../src ; fi
-
    for F in ../src/*.java; do
 	echo Patching $F
 	$SEDI "s/^package .*;/package $AppFullName;/" $F
@@ -836,12 +836,28 @@ cd ../..
 
 
 echo Patching project/AndroidManifest.xml
-cat project/AndroidManifestTemplate.xml | \
+if [ "$LibSdlVersion" = "2.0" ] ; then
-	sed "s/package=.*/package=\"$AppFullName\"/" | \
+	cat project/jni/sdl-2.0/android-project/app/src/main/AndroidManifest.xml | \
-	sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \
+		sed "s/package=.*/package=\"$AppFullName\"/" | \
-	sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
+		sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
-	sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" > \
+		sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" > \
-	project/AndroidManifest.xml
+		project/AndroidManifest.xml
+else
+	cat project/AndroidManifestTemplate.xml | \
+		sed "s/package=.*/package=\"$AppFullName\"/" | \
+		sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \
+		sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
+		sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" > \
+		project/AndroidManifest.xml
+fi
+
+
+if [ "$LibSdlVersion" = "2.0" ] ; then
+	echo Copying some SDL 2.0 resources
+	cp -pr project/jni/sdl-2.0/android-project/app/src/main/res/* project/res/
+fi
+
+
 if [ "$AdmobPublisherId" = "n" -o -z "$AdmobPublisherId" ] ; then
 	$SEDI "/==ADMOB==/ d" project/AndroidManifest.xml
 	AdmobPublisherId=""
@@ -943,7 +959,23 @@ fi
 
 
 if [ "$LibSdlVersion" = "2.0" ] ; then
-	echo Patching java files not supported in SDL 2.0 yet.
+echo Patching java files not fully supported in SDL 2.0 yet.
+ACTIVITY="${AppShortName}Activity"
+sed -i -e "s|\"SDLActivity\"|\"$ACTIVITY\"|g" project/AndroidManifest.xml
+
+echo Creating $JAVA_SRC_PATH/$ACTIVITY.java ...
+
+# Fill in a default Activity
+cat >"$JAVA_SRC_PATH/$ACTIVITY.java" <<__EOF__
+package $AppFullName;
+
+import org.libsdl.app.SDLActivity;
+
+public class $ACTIVITY extends SDLActivity
+{
+}
+__EOF__
+
 else
 echo Patching project/src/Globals.java
 $SEDI "s/public static String ApplicationName = .*;/public static String ApplicationName = \"$AppShortName\";/" project/src/Globals.java

project/jni/application/sdl-2.0-test/AndroidAppSettings.cfg

@@ -32,7 +32,7 @@ RedefinedKeysScreenKb="1 2 3 4 5 6 1 2 3 4"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig'
 FirstStartMenuOptions=''
-MultiABI=n
+MultiABI=y
 AppVersionCode=101
 AppVersionName="1.01"
 ResetSdlConfigForThisVersion=n

project/res/values/styles.xml

@@ -1,4 +1,8 @@
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
     </style>
+
 </resources>