Skip to content
Permalink
Browse files

Bug 2739 - [Android] No support for SDL_DisableScreenSaver by Martin …

…Gerhardy
  • Loading branch information
gabomdq committed Oct 20, 2014
1 parent ec4dfdf commit 79035b393aae5eb0789b1c81360eab749cb8c601
@@ -187,6 +187,13 @@ public boolean dispatchKeyEvent(KeyEvent event) {
return super.dispatchKeyEvent(event);
}

public static void suspendScreenSaver(boolean suspend) {
if (suspend)
mSingleton.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
else
mSingleton.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}

/** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
* is the first to be called, mIsSurfaceReady should still be set
* to 'true' during the call to onPause (in a usual scenario).
@@ -77,6 +77,7 @@ static jmethodID midAudioWriteShortBuffer;
static jmethodID midAudioWriteByteBuffer;
static jmethodID midAudioQuit;
static jmethodID midPollInputDevices;
static jmethodID midSuspendScreenSaver;

/* Accelerometer data storage */
static float fLastAccelerometer[3];
@@ -131,6 +132,8 @@ JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv* mEnv, jclass cls)
"audioQuit", "()V");
midPollInputDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
"pollInputDevices", "()V");
midSuspendScreenSaver = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
"suspendScreenSaver", "(Z)V");

bHasNewData = false;

@@ -444,7 +447,13 @@ static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder)

static SDL_bool LocalReferenceHolder_IsActive()
{
return s_active > 0;
return s_active > 0;
}

void Android_JNI_SuspendScreenSaver(SDL_bool suspend)
{
JNIEnv *env = Android_JNI_GetEnv();
(*env)->CallStaticObjectMethod(env, mActivityClass, midSuspendScreenSaver, suspend);
}

ANativeWindow* Android_JNI_GetNativeWindow(void)
@@ -68,6 +68,8 @@ int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seco
/* Joystick support */
void Android_JNI_PollInputDevices();

/* Video */
void Android_JNI_SuspendScreenSaver(SDL_bool suspend);

/* Touch support */
int Android_JNI_GetTouchDeviceIds(int **ids);
@@ -75,6 +75,12 @@ Android_Available(void)
return 1;
}

static void
Android_SuspendScreenSaver(_THIS)
{
Android_JNI_SuspendScreenSaver(_this->suspend_screensaver);
}

static void
Android_DeleteDevice(SDL_VideoDevice * device)
{
@@ -126,6 +132,9 @@ Android_CreateDevice(int devindex)
device->GL_SwapWindow = Android_GLES_SwapWindow;
device->GL_DeleteContext = Android_GLES_DeleteContext;

/* Screensaver */
device->SuspendScreenSaver = Android_SuspendScreenSaver;

/* Text input */
device->StartTextInput = Android_StartTextInput;
device->StopTextInput = Android_StopTextInput;

0 comments on commit 79035b3

Please sign in to comment.