Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '3c0081b069acf06912b2497cb93664efc43c52ed':
  Use exactly the same timings for the ElectronBeam as JB.
This commit is contained in:
Jeff Brown
2012-10-10 23:26:01 -07:00
committed by Android Git Automerger
parent cd70a4c23c 3c0081b069
commit 51d5a04e3d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/power/DisplayPowerController.java
View File

@@ -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;

2
services/java/com/android/server/power/ElectronBeam.java
View File

@@ -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.