diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index c8bc7988a..15fda4060 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -414,7 +414,6 @@ public class MainActivity extends Activity System.exit(0); } - static boolean keyboardWithoutTextInputShown = false; public void showScreenKeyboardWithoutTextInputField() { if( !keyboardWithoutTextInputShown ) @@ -553,6 +552,9 @@ public class MainActivity extends Activity public void hideScreenKeyboard() { + if( keyboardWithoutTextInputShown ) + showScreenKeyboardWithoutTextInputField(); + if(_screenKeyboard == null) return; @@ -571,6 +573,8 @@ public class MainActivity extends Activity mGLView.setFocusableInTouchMode(true); mGLView.setFocusable(true); mGLView.requestFocus(); + DimSystemStatusBar.get().dim(_videoLayout); + DimSystemStatusBar.get().dim(mGLView); }; public boolean isScreenKeyboardShown() @@ -1137,6 +1141,7 @@ public class MainActivity extends Activity private FrameLayout _videoLayout = null; private EditText _screenKeyboard = null; private String _screenKeyboardHintMessage = null; + static boolean keyboardWithoutTextInputShown = false; private boolean sdlInited = false; public interface TouchEventsListener diff --git a/project/java/Video.java b/project/java/Video.java index d0cfbc57a..339a63fd3 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -838,6 +838,7 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL { @Override public void onPause() { + Log.i("SDL", "libSDL: DemoGLSurfaceView.onPause(): mRenderer.mGlSurfaceCreated " + mRenderer.mGlSurfaceCreated + " mRenderer.mPaused " + mRenderer.mPaused + (mRenderer.mPaused ? " - not doing anything" : "")); if(mRenderer.mPaused) return; mRenderer.mPaused = true; @@ -853,11 +854,11 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL { @Override public void onResume() { + Log.i("SDL", "libSDL: DemoGLSurfaceView.onResume(): mRenderer.mGlSurfaceCreated " + mRenderer.mGlSurfaceCreated + " mRenderer.mPaused " + mRenderer.mPaused + (!mRenderer.mPaused ? " - not doing anything" : "")); if(!mRenderer.mPaused) return; mRenderer.mPaused = false; super.onResume(); - Log.i("SDL", "libSDL: DemoGLSurfaceView.onResume(): mRenderer.mGlSurfaceCreated " + mRenderer.mGlSurfaceCreated + " mRenderer.mPaused " + mRenderer.mPaused); if( mRenderer.mGlSurfaceCreated && ! mRenderer.mPaused || Globals.NonBlockingSwapBuffers ) mRenderer.nativeGlContextRecreated(); if( mRenderer.accelerometer != null && mRenderer.accelerometer.openedBySDL ) // For some reason it crashes here often - are we getting this event before initialization? diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index d77227a0c..8b7eb92bf 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="GIMP Inkscape" AppFullName=org.gimp.inkscape # Application version code (integer) -AppVersionCode=28209 +AppVersionCode=28210 # Application user-visible version name (string) -AppVersionName="2.8.2.09" +AppVersionName="2.8.2.10" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg index 41f1c74d2..5cbfdcedb 100644 --- a/project/jni/application/xserver/AndroidAppSettings.cfg +++ b/project/jni/application/xserver/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="XServer XSDL" AppFullName=x.org.server # Application version code (integer) -AppVersionCode=11108 +AppVersionCode=11109 # Application user-visible version name (string) -AppVersionName="1.11.08" +AppVersionName="1.11.09" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -138,7 +138,7 @@ AppRecordsAudio=n AccessSdCard= # Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n) -ImmersiveMode= +ImmersiveMode=y # Application implements Android-specific routines to put to background, and will not draw anything to screen # between SDL_ACTIVEEVENT lost / gained notifications - you should check for them diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 54234bc3b..086b01dd1 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 54234bc3b93103e11e4242c00466ed4c92ccf7fb +Subproject commit 086b01dd17a46d6fd1a95064155faac233a7566e