Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c0081b0 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

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

parents 6918d9f9 3c584f20

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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.