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

Author: Jeff Brown

services/java/com/android/server/power/DisplayPowerController.java

@@ -648,10 +648,10 @@ private void updatePowerState() {
                 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;