am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev

* commit 'b21b4fdcea2d3ff4186f4c8dbcd89493cc4fd2bf':
  Dim the screen quickly in response to user activity timeout.
This commit is contained in:
Jeff Brown
2012-10-24 15:00:31 -07:00
committed by Android Git Automerger

View File

@@ -648,10 +648,10 @@ final class DisplayPowerController {
mUsingScreenAutoBrightness = false; mUsingScreenAutoBrightness = false;
} }
if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DIM) { if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DIM) {
// Dim slowly by at least some minimum amount. // Dim quickly by at least some minimum amount.
target = Math.min(target - SCREEN_DIM_MINIMUM_REDUCTION, target = Math.min(target - SCREEN_DIM_MINIMUM_REDUCTION,
mScreenBrightnessDimConfig); mScreenBrightnessDimConfig);
slow = true; slow = false;
} else if (wasDim) { } else if (wasDim) {
// Brighten quickly. // Brighten quickly.
slow = false; slow = false;