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

Commit eb840eac authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Blank screen when coming from pulse 

We need to fade from black to the app to achieve a nice transition.

Test: visual
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I13edd9c5f7a1bf9378851ac50c513d36ab821c43
Fixes: 87939048
parent 96910a6d

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public enum ScrimState { 
            mCurrentInFrontAlpha = 0;

            mAnimationDuration = StatusBar.FADE_KEYGUARD_DURATION;



            if (previousState == ScrimState.AOD) {

            if (previousState == ScrimState.AOD || previousState == ScrimState.PULSING) {

                // Fade from black to transparent when coming directly from AOD

                updateScrimColor(mScrimInFront, 1, Color.BLACK);

                updateScrimColor(mScrimBehind, 1, Color.BLACK);

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

+17 −0
Original line number Diff line number Diff line
@@ -350,6 +350,23 @@ public class ScrimControllerTest extends SysuiTestCase { 
        mScrimController.finishAnimationsImmediately();

    }



    @Test

    public void scrimBlanksWhenUnlockingFromPulse() {

        boolean[] blanked = {false};

        // Simulate unlock with fingerprint

        mScrimController.transitionTo(ScrimState.PULSING);

        mScrimController.finishAnimationsImmediately();

        mScrimController.transitionTo(ScrimState.UNLOCKED,

                new ScrimController.Callback() {

                    @Override

                    public void onDisplayBlanked() {

                        blanked[0] = true;

                    }

                });

        mScrimController.finishAnimationsImmediately();

        Assert.assertTrue("Scrim should blank when unlocking from pulse.", blanked[0]);

    }



    @Test

    public void testScrimCallback() {

        int[] callOrder = {0, 0, 0};