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

* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
  Dim the screen quickly in response to user activity timeout.
This commit is contained in:
Jeff Brown
2012-10-24 14:58:26 -07:00
committed by Android Git Automerger

View File

@@ -648,10 +648,10 @@ final class DisplayPowerController {
mUsingScreenAutoBrightness = false;
}
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,
mScreenBrightnessDimConfig);
slow = true;
slow = false;
} else if (wasDim) {
// Brighten quickly.
slow = false;