diff options
| author | Craig Mautner <cmautner@google.com> | 2012-06-06 15:24:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-06 15:24:36 -0700 |
| commit | a9144ffd6466a914a9138dabab8bc331fdc70e2f (patch) | |
| tree | bddb2e563ad593258622dd608f4c0cf0e860d172 /services/java/com/android/server/PowerManagerService.java | |
| parent | 4ca17df3802cad87a4d07b804823ad9c11e090ea (diff) | |
| parent | a4e96d5a6e07f342f1a4b972c1620340cb289de8 (diff) | |
Merge "Disable automatic screen dimming." into jb-dev
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 dda6323c5c20..0280425f9d3f 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; |