miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed SDL_HideScreenKeyboard() not restoring immersive mode and not hiding the SDL_ANDROID_ToggleScreenKeyboardWithoutTextInput() keyboard.

Browse Source
This commit is contained in:
pelya
2014-01-06 02:20:34 +02:00
parent bbcb0af7d4
commit bdde59bfa6
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
project/java/MainActivity.java
View File

@@ -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

3
project/java/Video.java
View File

@@ -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?

4
project/jni/application/xserver-gimp/AndroidAppSettings.cfg
View File

@@ -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

6
project/jni/application/xserver/AndroidAppSettings.cfg
View File

@@ -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

2
project/jni/application/xserver/xserver

Submodule project/jni/application/xserver/xserver updated: 54234bc3b9...086b01dd17