Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev

Author: Jeff Brown

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

@@ -110,7 +110,7 @@ final class DisplayPowerController {
     private static final long TWILIGHT_ADJUSTMENT_TIME = DateUtils.HOUR_IN_MILLIS * 2;
 
     private static final int ELECTRON_BEAM_ON_ANIMATION_DURATION_MILLIS = 250;
-    private static final int ELECTRON_BEAM_OFF_ANIMATION_DURATION_MILLIS = 450;
+    private static final int ELECTRON_BEAM_OFF_ANIMATION_DURATION_MILLIS = 400;
 
     private static final int MSG_UPDATE_POWER_STATE = 1;
     private static final int MSG_PROXIMITY_SENSOR_DEBOUNCED = 2;

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

@@ -60,7 +60,7 @@ final class ElectronBeam {
     // The relative proportion of the animation to spend performing
     // the horizontal stretch effect.  The remainder is spent performing
     // the vertical stretch effect.
-    private static final float HSTRETCH_DURATION = 0.4f;
+    private static final float HSTRETCH_DURATION = 0.5f;
     private static final float VSTRETCH_DURATION = 1.0f - HSTRETCH_DURATION;
 
     // Set to true when the animation context has been fully prepared.