Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7dc642d0: am df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.

Browse Source 
Merge commit '7dc642d0b9f9395221818978d2cd9143cd3cad36' into eclair-mr2-plus-aosp

* commit '7dc642d0b9f9395221818978d2cd9143cd3cad36':
  Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
This commit is contained in:
Mike Lockwood
2009-11-01 05:41:20 -08:00
committed by Android Git Automerger
parent 301eff069c 7dc642d0b9
commit 47fd5cd1fa
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/PowerManagerService.java
View File

@@ -1922,7 +1922,12 @@ class PowerManagerService extends IPowerManager.Stub
if ((mPowerState & BATTERY_LOW_BIT) == 0) { if ((mPowerState & BATTERY_LOW_BIT) == 0) {
int lcdValue = getAutoBrightnessValue(value, mLcdBacklightValues); int lcdValue = getAutoBrightnessValue(value, mLcdBacklightValues);
int buttonValue = getAutoBrightnessValue(value, mButtonBacklightValues); int buttonValue = getAutoBrightnessValue(value, mButtonBacklightValues);
int keyboardValue = getAutoBrightnessValue(value, mKeyboardBacklightValues); int keyboardValue;
if (mKeyboardVisible) {
keyboardValue = getAutoBrightnessValue(value, mKeyboardBacklightValues);
} else {
keyboardValue = 0;
}
mLightSensorBrightness = lcdValue; mLightSensorBrightness = lcdValue;
if (mDebugLightSensor) { if (mDebugLightSensor) {
@@ -2044,6 +2049,14 @@ class PowerManagerService extends IPowerManager.Stub
// will take care of turning on due to a true change to the lid // will take care of turning on due to a true change to the lid
// switch and synchronized with the lock screen. // switch and synchronized with the lock screen.
if ((mPowerState & SCREEN_ON_BIT) != 0) { if ((mPowerState & SCREEN_ON_BIT) != 0) {
if (mAutoBrightessEnabled && mUseSoftwareAutoBrightness) {
// force recompute of backlight values
if (mLightSensorValue >= 0) {
int value = (int)mLightSensorValue;
mLightSensorValue = -1;
lightSensorChangedLocked(value);
}
}
userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true); userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true);
} }
} }
@@ -2273,7 +2286,8 @@ class PowerManagerService extends IPowerManager.Stub
// Don't let applications turn the screen all the way off // Don't let applications turn the screen all the way off
brightness = Math.max(brightness, Power.BRIGHTNESS_DIM); brightness = Math.max(brightness, Power.BRIGHTNESS_DIM);
mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_BACKLIGHT, brightness); mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_BACKLIGHT, brightness);
mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_KEYBOARD, brightness); mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_KEYBOARD,
(mKeyboardVisible ? brightness : 0));
mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_BUTTONS, brightness); mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_BUTTONS, brightness);
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {