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

Merge "Fix 6119433: disambiguate screen brightness changes from other lights"

Browse Source
This commit is contained in:
Jim Miller
2012-03-07 15:21:31 -08:00
committed by Android (Google) Code Review
parent 94828c3f3b 18651804ff
commit 8247add51d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2234,14 +2234,18 @@ public class PowerManagerService extends IPowerManager.Stub
}
if (target != currentValue) {
final boolean doScreenAnim = (mask & (SCREEN_BRIGHT_BIT | SCREEN_ON_BIT)) != 0;
final boolean turningOff = endValue == Power.BRIGHTNESS_OFF;
if (turningOff && ((mask & (SCREEN_ON_BIT | SCREEN_BRIGHT_BIT)) != 0)) {
if (turningOff && doScreenAnim) {
// Cancel all pending animations since we're turning off
mScreenBrightnessHandler.removeCallbacksAndMessages(null);
screenOffFinishedAnimatingLocked(mScreenOffReason);
duration = 200; // TODO: how long should this be?
}
animateInternal(mask, turningOff, 0);
if (doScreenAnim) {
animateInternal(mask, turningOff, 0);
}
// TODO: Handle keyboard light animation when we have devices that support it
}
}
}