diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-24 15:00:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-24 15:00:31 -0700 |
| commit | bf3c28982c3b487f516b1b118944818426fc5fed (patch) | |
| tree | a483b1cc98c12eab6606731a595a7f6a50f7ba15 | |
| parent | f323fd07ba75b8bc13470a22f698937345bc9f0d (diff) | |
| parent | b21b4fdcea2d3ff4186f4c8dbcd89493cc4fd2bf (diff) | |
| download | frameworks_base-bf3c28982c3b487f516b1b118944818426fc5fed.zip frameworks_base-bf3c28982c3b487f516b1b118944818426fc5fed.tar.gz frameworks_base-bf3c28982c3b487f516b1b118944818426fc5fed.tar.bz2 | |
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.
| -rw-r--r-- | services/java/com/android/server/power/DisplayPowerController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/power/DisplayPowerController.java b/services/java/com/android/server/power/DisplayPowerController.java index 4abd8f5..317fec0 100644 --- a/services/java/com/android/server/power/DisplayPowerController.java +++ b/services/java/com/android/server/power/DisplayPowerController.java @@ -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; |