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

Commit 3370fe43 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Scrim: Normalize behind scrim when unoccluding." into tm-dev am: 6cde647f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17412171



Change-Id: I9686734f787ee07970f29f79190aa516efd6908e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b46e66e7 6cde647f

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -858,6 +858,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
                // We're unoccluding the keyguard and don't want to have a bright flash.

                // We're unoccluding the keyguard and don't want to have a bright flash.

                mNotificationsAlpha = ScrimState.KEYGUARD.getNotifAlpha();

                mNotificationsAlpha = ScrimState.KEYGUARD.getNotifAlpha();

                mNotificationsTint = ScrimState.KEYGUARD.getNotifTint();

                mNotificationsTint = ScrimState.KEYGUARD.getNotifTint();

                mBehindAlpha = ScrimState.KEYGUARD.getBehindAlpha();

                mBehindTint = ScrimState.KEYGUARD.getBehindTint();

            }

            }

        }

        }

        if (mState != ScrimState.UNLOCKED) {

        if (mState != ScrimState.UNLOCKED) {

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

+15 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,6 @@ public class ScrimControllerTest extends SysuiTestCase { 
    @Mock

    @Mock

    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;







    private static class AnimatorListener implements Animator.AnimatorListener {

    private static class AnimatorListener implements Animator.AnimatorListener {

        private int mNumStarts;

        private int mNumStarts;

        private int mNumEnds;

        private int mNumEnds;
@@ -1369,6 +1368,21 @@ public class ScrimControllerTest extends SysuiTestCase { 
    }

    }









    @Test

    public void setUnOccludingAnimationKeyguard() {

        mScrimController.setUnocclusionAnimationRunning(true);

        mScrimController.transitionTo(ScrimState.KEYGUARD);

        finishAnimationsImmediately();

        assertThat(mNotificationsScrim.getViewAlpha())

                .isWithin(0.01f).of(ScrimState.KEYGUARD.getNotifAlpha());

        assertThat(mNotificationsScrim.getTint())

                .isEqualTo(ScrimState.KEYGUARD.getNotifTint());

        assertThat(mScrimBehind.getViewAlpha())

                .isWithin(0.01f).of(ScrimState.KEYGUARD.getBehindAlpha());

        assertThat(mScrimBehind.getTint())

                .isEqualTo(ScrimState.KEYGUARD.getBehindTint());

    }



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

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

        mScrimController.setRawPanelExpansionFraction(expansion);

        mScrimController.setRawPanelExpansionFraction(expansion);

        finishAnimationsImmediately();

        finishAnimationsImmediately();