Merge "Disable automatic screen dimming." into jb-dev
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index dda6323..0280425 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -178,8 +178,9 @@
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;