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

Commit 3cb59428 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fade scrims slower when entering AOD" into pi-dev 

am: 6a95a2cc

Change-Id: I3789bf84c4aae8d9b598c2ef0a9b6909f61af420
parents 9faa6c14 6a95a2cc

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+7 −1
Original line number Diff line number Diff line
@@ -68,8 +68,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    private static final String TAG = "ScrimController";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    /**

     * General scrim animation duration.

     */

    public static final long ANIMATION_DURATION = 220;



    /**

     * Longer duration, currently only used when going to AOD.

     */

    public static final long ANIMATION_DURATION_LONG = 1000;

    /**

     * When both scrims have 0 alpha.

     */

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public enum ScrimState { 
            mCurrentInFrontAlpha = alwaysOnEnabled ? mAodFrontScrimAlpha : 1f;

            mCurrentInFrontTint = Color.BLACK;

            mCurrentBehindTint = Color.BLACK;

            mAnimationDuration = ScrimController.ANIMATION_DURATION_LONG;

            // DisplayPowerManager will blank the screen for us, we just need

            // to set our state.

            mAnimateChange = !mDisplayRequiresBlanking;