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

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

Merge "Scrim: Remove scrim flicker" into tm-dev

parents 957b746c 2bda393c

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

+4 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        if (aodWallpaperTimeout || occludedKeyguard) {

            mBehindAlpha = 1;

        }

        // Prevent notification scrim flicker when transitioning away from keyguard.

        if (mKeyguardStateController.isKeyguardGoingAway()) {

            mNotificationsAlpha = 0;

        }

        setScrimAlpha(mScrimInFront, mInFrontAlpha);

        setScrimAlpha(mScrimBehind, mBehindAlpha);

        setScrimAlpha(mNotificationsScrim, mNotificationsAlpha);

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

+9 −0
Original line number Diff line number Diff line
@@ -1360,6 +1360,15 @@ public class ScrimControllerTest extends SysuiTestCase { 
        ));

    }



    @Test

    public void keyguardGoingAwayUpdateScrims() {

        when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);

        mScrimController.updateScrims();

        finishAnimationsImmediately();

        assertThat(mNotificationsScrim.getViewAlpha()).isEqualTo(TRANSPARENT);

    }





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

        mScrimController.setRawPanelExpansionFraction(expansion);

        finishAnimationsImmediately();