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

Commit 2ae06d9b authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[Keyguard] Remove behind scrim for alarm" into tm-qpr-dev

parents 591a11a4 6ad8c89e

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

+2 −1
Original line number Diff line number Diff line
@@ -783,7 +783,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
                mInFrontAlpha = 0;

            }



            if (mBouncerHiddenFraction != KeyguardBouncer.EXPANSION_HIDDEN) {

            if (mState == ScrimState.DREAMING

                    && mBouncerHiddenFraction != KeyguardBouncer.EXPANSION_HIDDEN) {

                final float interpolatedFraction =

                        BouncerPanelExpansionCalculator.aboutToShowBouncerProgress(

                                mBouncerHiddenFraction);

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

+9 −0
Original line number Diff line number Diff line
@@ -1553,6 +1553,15 @@ public class ScrimControllerTest extends SysuiTestCase { 
                mScrimInFront.shouldBlendWithMainColor());

    }



    @Test

    public void applyState_unlocked_bouncerShowing() {

        mScrimController.transitionTo(ScrimState.UNLOCKED);

        mScrimController.setBouncerHiddenFraction(0.99f);

        mScrimController.setRawPanelExpansionFraction(0f);

        finishAnimationsImmediately();

        assertScrimAlpha(mScrimBehind, 0);

    }



    private void assertAlphaAfterExpansion(ScrimView scrim, float expectedAlpha, float expansion) {

        mScrimController.setRawPanelExpansionFraction(expansion);

        finishAnimationsImmediately();