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

am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev

Browse Source 
automerge: 9d2a478

* commit '9d2a47857899845d2e00f4a968a0916deeb1fb2e':
  Don't animate screen brightness if there is a pending off transition
This commit is contained in:
Prashant Malani
2014-11-15 10:13:23 +00:00
committed by android-build-merger
parent e9f8d1ddbd 9d2a478578
commit 673d86591f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -669,12 +669,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// 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.
if (!mPendingScreenOff) {
if (state == Display.STATE_ON || state == Display.STATE_DOZE) { if (state == Display.STATE_ON || state == 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 {
animateScreenBrightness(brightness, 0); animateScreenBrightness(brightness, 0);
} }
}
// Determine whether the display is ready for use in the newly requested state. // Determine whether the display is ready for use in the newly requested state.
// Note that we do not wait for the brightness ramp animation to complete before // Note that we do not wait for the brightness ramp animation to complete before