pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #2022, do not resume on Android when surfaceChanged

Browse source 
If the app is in landscape mode and the user presses the power button, a pause
is followed immediately by a surfaceChanged event because the lock screen
is shown in portrait mode. This triggers a "false" resume.
So, we just pause and resume following the onWindowFocusChanged events.

Also, wait for SDL_APP_WILLENTERBACKGROUND and SDL_APP_DIDENTERBACKGROUND before
blocking the event pump.
This commit is contained in:
Gabriel Jacobo 2013-08-12 11:13:50 -03:00
parent dd7da60a4f
commit a3982939c5
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
android-project/src/org/libsdl/app/SDLActivity.java
View file

@ -695,11 +695,6 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread"); SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
enableSensor(Sensor.TYPE_ACCELEROMETER, true); enableSensor(Sensor.TYPE_ACCELEROMETER, true);
SDLActivity.mSDLThread.start(); SDLActivity.mSDLThread.start();
} else {
// The app already exists, we resume via handleResume
// Multiple sequential calls to surfaceChanged are handled internally by handleResume
SDLActivity.handleResume();
} }
} }

6
src/video/android/SDL_androidevents.c
View file

@ -64,9 +64,9 @@ Android_PumpEvents(_THIS)
else { else {
#if SDL_ANDROID_BLOCK_ON_PAUSE #if SDL_ANDROID_BLOCK_ON_PAUSE
if( isPausing || SDL_SemTryWait(Android_PauseSem) == 0 ) { if( isPausing || SDL_SemTryWait(Android_PauseSem) == 0 ) {
/* We've been signaled to pause, but before we block ourselves, we need to make sure that /* We've been signaled to pause, but before we block ourselves,
SDL_WINDOWEVENT_FOCUS_LOST and SDL_WINDOWEVENT_MINIMIZED have reached the app */ we need to make sure that certain key events have reached the app */
if (SDL_HasEvent(SDL_WINDOWEVENT)) { if (SDL_HasEvent(SDL_WINDOWEVENT) || SDL_HasEvent(SDL_APP_WILLENTERBACKGROUND) || SDL_HasEvent(SDL_APP_DIDENTERBACKGROUND) ) {
isPausing = 1; isPausing = 1;
} }
else { else {