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

Commit bae40813 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make sure scrims will fade from black" into qt-r1-dev

parents 5faf43ad a7eacf93

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

+3 −1
Original line number Diff line number Diff line
@@ -491,8 +491,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
     * away once the display turns on.

     */

    public void prepareForGentleWakeUp() {

        if (mState == ScrimState.AOD && mDozeParameters.getAlwaysOn()) {

        if (mState == ScrimState.AOD) {

            mCurrentInFrontAlpha = 1f;

            mCurrentInFrontTint = Color.BLACK;

            mCurrentBehindTint = Color.BLACK;

            mAnimateChange = false;

            updateScrims();

            mAnimateChange = true;

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

+3 −0
Original line number Diff line number Diff line
@@ -129,7 +129,10 @@ public enum ScrimState { 
        public void prepare(ScrimState previousState) {

            mCurrentInFrontAlpha = 0f;

            mCurrentBehindTint = Color.BLACK;

            mCurrentInFrontTint = Color.BLACK;

            mBlankScreen = mDisplayRequiresBlanking;

            mAnimationDuration = mWakeLockScreenSensorActive

                    ? ScrimController.ANIMATION_DURATION_LONG : ScrimController.ANIMATION_DURATION;

        }



        @Override

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -225,11 +225,12 @@ public class ScrimControllerTest extends SysuiTestCase { 


        mScrimController.transitionTo(ScrimState.PULSING);

        mScrimController.finishAnimationsImmediately();

        // Front scrim should be transparent

        // Front scrim should be transparent, but tinted

        // Back scrim should be semi-transparent so the user can see the wallpaper

        // Pulse callback should have been invoked

        assertScrimVisibility(VISIBILITY_FULLY_TRANSPARENT, VISIBILITY_FULLY_OPAQUE);

        assertScrimTint(mScrimBehind, true /* tinted */);

        assertScrimTint(mScrimInFront, true /* tinted */);



        mScrimController.setWakeLockScreenSensorActive(true);

        mScrimController.finishAnimationsImmediately();