From 609695dab0f0318459d32ff5dfc529d7398e751b Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 14 Oct 2010 14:57:49 -0700 Subject: Screen on/off animation tweaks - Pass to surface flinger whether we want animations or not. - Don't use the animation when the screen goes off because of the prox sensor. - Turn the screen-on animation back off - Also, now the animation setting controls whether or not we do the animation. Bug: 3097475 Bug: 3098508 Change-Id: I205d5564d6668b33a8dc1c40d8cc06c4aad305cf --- services/jni/com_android_server_PowerManagerService.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'services/jni') diff --git a/services/jni/com_android_server_PowerManagerService.cpp b/services/jni/com_android_server_PowerManagerService.cpp index 2ec20bd..705be60 100644 --- a/services/jni/com_android_server_PowerManagerService.cpp +++ b/services/jni/com_android_server_PowerManagerService.cpp @@ -125,9 +125,9 @@ static void android_server_PowerManagerService_nativeSetPowerState(JNIEnv* env, } static void android_server_PowerManagerService_nativeStartSurfaceFlingerAnimation(JNIEnv* env, - jobject obj) { + jobject obj, jint mode) { sp s(ComposerService::getComposerService()); - s->turnElectronBeamOff(0); + s->turnElectronBeamOff(mode); } // ---------------------------------------------------------------------------- @@ -138,7 +138,7 @@ static JNINativeMethod gPowerManagerServiceMethods[] = { (void*) android_server_PowerManagerService_nativeInit }, { "nativeSetPowerState", "(ZZ)V", (void*) android_server_PowerManagerService_nativeSetPowerState }, - { "nativeStartSurfaceFlingerAnimation", "()V", + { "nativeStartSurfaceFlingerAnimation", "(I)V", (void*) android_server_PowerManagerService_nativeStartSurfaceFlingerAnimation }, }; -- cgit v1.1