From 0df7fe84040789a7a6555a05e8209810d8323cda Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 1 Mar 2018 08:22:56 -0800 Subject: [PATCH] Temporarily disabled fullscreen switching code on Android, until we can resolve bug 4096 - Enabling fullscreen on Android causes the app to toggle fullscreen mode continuously in a loop --- .../app/src/main/java/org/libsdl/app/SDLActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index 750db69fa..8c363ed5b 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -436,6 +436,12 @@ public class SDLActivity extends Activity { } break; case COMMAND_CHANGE_WINDOW_STYLE: + if (Build.VERSION.SDK_INT < 19) { + // This version of Android doesn't support the immersive fullscreen mode + break; + } +/* This needs more testing, per bug 4096 - Enabling fullscreen on Android causes the app to toggle fullscreen mode continuously in a loop + *** if (context instanceof Activity) { Window window = ((Activity) context).getWindow(); if (window != null) { @@ -457,6 +463,7 @@ public class SDLActivity extends Activity { } else { Log.e(TAG, "error handling message, getContext() returned no Activity"); } +***/ break; case COMMAND_TEXTEDIT_HIDE: if (mTextEdit != null) { @@ -725,7 +732,7 @@ public class SDLActivity extends Activity { public static boolean isTextInputEvent(KeyEvent event) { // Key pressed with Ctrl should be sent as SDL_KEYDOWN/SDL_KEYUP and not SDL_TEXTINPUT - if (android.os.Build.VERSION.SDK_INT >= 11) { + if (Build.VERSION.SDK_INT >= 11) { if (event.isCtrlPressed()) { return false; }