diff options
| author | Prashant Malani <pmalani@google.com> | 2014-11-15 09:56:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-15 09:56:57 +0000 |
| commit | 4d269ba32037485bfa5ffba4dd23f796cbf10c43 (patch) | |
| tree | e48224f99041a78d5764f0bed0a4414a74a54a25 | |
| parent | 2a46722f96480aed028785e955cbb8cb506df0b2 (diff) | |
| parent | fb26a2c80b988118983251caf36492f2ae39559c (diff) | |
| download | frameworks_base-4d269ba32037485bfa5ffba4dd23f796cbf10c43.zip frameworks_base-4d269ba32037485bfa5ffba4dd23f796cbf10c43.tar.gz frameworks_base-4d269ba32037485bfa5ffba4dd23f796cbf10c43.tar.bz2 | |
am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev
* commit 'fb26a2c80b988118983251caf36492f2ae39559c':
Don't animate screen brightness if there is a pending off transition
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 8cfb4b3..78610ff 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -669,11 +669,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Animate the screen brightness when the screen is on or dozing. // Skip the animation when the screen is off or suspended. - if (state == Display.STATE_ON || state == Display.STATE_DOZE) { - animateScreenBrightness(brightness, - slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); - } else { - animateScreenBrightness(brightness, 0); + if (!mPendingScreenOff) { + if (state == Display.STATE_ON || state == Display.STATE_DOZE) { + animateScreenBrightness(brightness, + slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); + } else { + animateScreenBrightness(brightness, 0); + } } // Determine whether the display is ready for use in the newly requested state. |