From 26e6eef233f1a3f31bb9012b4dc5e264e8d13bd7 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Wed, 23 Sep 2015 00:43:34 +0700
Subject: [PATCH] Update version info, disable buggy fullscreen on 2.3

---
 AndroidManifest.xml                 | 1 -
 jni/Application.mk                  | 2 +-
 src/org/libsdl/app/SDLActivity.java | 6 ++++--
 test/AndroidManifest.xml            | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1da4a3cb..97d09b38 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,6 @@
 	<activity android:name="org.libsdl.app.SDLActivity"
 	   android:screenOrientation="sensorLandscape"
 	   android:configChanges="orientation|screenSize"
-		android:windowSoftInputMode="adjustResize"
 	   android:label="@string/app_name"
 		android:taskAffinity="org.libsdl.app.SDLActivity"
 	   >
diff --git a/jni/Application.mk b/jni/Application.mk
index ce6e2e5f..3c786d18 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -12,7 +12,7 @@ APP_PLATFORM := android-8
 endif
 
 
-CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024
+CFLAGS_OPT :=  -O3 -fomit-frame-pointer -ggdb -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -floop-block -funsafe-loop-optimizations -finline-limit=1024
 CFLAGS_OPT_ARM := -mthumb -mfpu=neon -mcpu=cortex-a9 -pipe -mvectorize-with-neon-quad -DVECTORIZE_SINCOS
 CFLAGS_OPT_ARMv5 :=-march=armv6 -mfpu=vfp -marm -pipe
 CFLAGS_OPT_X86 := -mtune=atom -march=atom -mssse3 -mfpmath=sse -funroll-loops -pipe -DVECTORIZE_SINCOS
diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java
index 81eb06b4..39cd90ce 100644
--- a/src/org/libsdl/app/SDLActivity.java
+++ b/src/org/libsdl/app/SDLActivity.java
@@ -161,8 +161,10 @@ public class SDLActivity extends Activity {
   
 		// fullscreen   
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-				WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		if(Build.VERSION.SDK_INT >= 12) {
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+					WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
 
 		// keep screen on 
 		getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 5cc8fecc..914637d7 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -4,7 +4,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="in.celest.xash3d.hl.test"
-      android:versionCode="0"
+      android:versionCode="1"
       android:versionName="0.15pre"
       android:installLocation="auto">
 
@@ -41,7 +41,6 @@
 	<activity android:name="org.libsdl.app.SDLActivity"
 	   android:screenOrientation="sensorLandscape"
 	   android:configChanges="orientation|screenSize"
-		android:windowSoftInputMode="adjustResize"
 	   android:label="@string/app_name"
 		android:taskAffinity="org.libsdl.app.SDLActivity"
 	   >