Merge "Additional fixes for button/keyboard backlight auto-brightness." into ics (66ba139a) · Commits · e / os / android_frameworks_base

services/java/com/android/server/PowerManagerService.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -2162,10 +2162,17 @@ public class PowerManagerService extends IPowerManager.Stub
		mLastLcdValue = value;
		}
		if ((mask & BUTTON_BRIGHT_BIT) != 0) {
		mButtonLight.setBrightness(value);
		// Use sensor-determined brightness values when the button (or keyboard)
		// light is on, since users may want to specify a custom brightness setting
		// that disables the button (or keyboard) backlight entirely in low-ambient
		// light situations.
		mButtonLight.setBrightness(mLightSensorButtonBrightness >= 0 && value > 0 ?
		mLightSensorButtonBrightness : value);

		}
		if ((mask & KEYBOARD_BRIGHT_BIT) != 0) {
		mKeyboardLight.setBrightness(value);
		mKeyboardLight.setBrightness(mLightSensorKeyboardBrightness >= 0 && value > 0 ?
		mLightSensorKeyboardBrightness : value);
		}
		}

		@@ -2758,10 +2765,10 @@ public class PowerManagerService extends IPowerManager.Stub
		}
		mLastLcdValue = value;
		}
		if (mButtonBrightnessOverride < 0) {
		if (mButtonBrightnessOverride < 0 && mAutoBrightnessButtonKeyboard) {
		mButtonLight.setBrightness(buttonValue);
		}
		if (mButtonBrightnessOverride < 0 \|\| !mKeyboardVisible) {
		if ((mButtonBrightnessOverride < 0 \|\| !mKeyboardVisible) && mAutoBrightnessButtonKeyboard) {
		mKeyboardLight.setBrightness(keyboardValue);
		}
		}