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

Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev

Browse Source
This commit is contained in:
Baligh Uddin
2014-10-02 21:38:24 +00:00
committed by Android (Google) Code Review
parent cdf7961f73 bf4e414cf0
commit 9cdde5f834
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -563,6 +563,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
state = Display.STATE_OFF; state = Display.STATE_OFF;
} }
// Animate the screen state change unless already animating.
// The transition may be deferred, so after this point we will use the
// actual state instead of the desired one.
animateScreenStateChange(state, performScreenOffTransition);
state = mPowerState.getScreenState();
// Use zero brightness when screen is off. // Use zero brightness when screen is off.
if (state == Display.STATE_OFF) { if (state == Display.STATE_OFF) {
brightness = PowerManager.BRIGHTNESS_OFF; brightness = PowerManager.BRIGHTNESS_OFF;
@@ -636,13 +642,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mAppliedLowPower = true; mAppliedLowPower = true;
} }
// Animate the screen state change unless already animating.
animateScreenStateChange(state, performScreenOffTransition);
// Animate the screen brightness when the screen is on or dozing. // Animate the screen brightness when the screen is on or dozing.
// Skip the animation when the screen is off or suspended. // Skip the animation when the screen is off or suspended.
final int actualState = mPowerState.getScreenState(); if (state == Display.STATE_ON || state == Display.STATE_DOZE) {
if (actualState == Display.STATE_ON || actualState == Display.STATE_DOZE) {
animateScreenBrightness(brightness, animateScreenBrightness(brightness,
slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST);
} else { } else {