diff options
| author | Craig Mautner <cmautner@google.com> | 2012-06-06 15:32:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-06 15:32:36 -0700 |
| commit | 409a1a5402a6ce2c7bacee07943ee207c6a1aa8d (patch) | |
| tree | 3691e03bbbbdc5fdf484d0f257f97e15bee6516b /services/java/com/android/server/PowerManagerService.java | |
| parent | b51e5bd666475d2720c425a69a95aebbd1e94801 (diff) | |
| parent | fd62576f06c05d6aab687892b9fcccfed3899021 (diff) | |
am fd62576f: am a9144ffd: Merge "Disable automatic screen dimming." into jb-dev
* commit 'fd62576f06c05d6aab687892b9fcccfed3899021':
Disable automatic screen dimming.
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index b9d82faf1795..da43bec7bcf5 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -178,8 +178,9 @@ public class PowerManagerService extends IPowerManager.Stub static final int ANIM_STEPS = 60; // nominal # of frames at 60Hz // Slower animation for autobrightness changes static final int AUTOBRIGHTNESS_ANIM_STEPS = 2 * ANIM_STEPS; - // Even slower animation for autodimness changes - static final int AUTODIMNESS_ANIM_STEPS = 15 * ANIM_STEPS; + // Even slower animation for autodimness changes. Set to max to effectively disable dimming. + // Note 100 is used to keep the mWindowScaleAnimation scaling below from overflowing an int. + static final int AUTODIMNESS_ANIM_STEPS = Integer.MAX_VALUE / (NOMINAL_FRAME_TIME_MS * 100); // Number of steps when performing a more immediate brightness change. static final int IMMEDIATE_ANIM_STEPS = 4; |