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

Commit 4035ef58 authored by Mady Mellor's avatar Mady Mellor
Browse files

resolve merge conflicts of bae40813 to qt-r1-bubbles-dev 

Bug: None
Test: atest ScrimControllerTest
Change-Id: Ic4db2e08af5a34c78de5b451165b16facf354610
parents b4ad2fc1 bae40813

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

+2 −0
Original line number Diff line number Diff line
@@ -512,6 +512,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    public void prepareForGentleWakeUp() {

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

            mInFrontAlpha = 1f;

            mInFrontTint = Color.BLACK;

            mBehindTint = 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
@@ -142,7 +142,10 @@ public enum ScrimState { 
            mFrontAlpha = 0f;

            mBubbleAlpha = 0f;

            mBehindTint = Color.BLACK;

            mFrontTint = 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 −2
Original line number Diff line number Diff line
@@ -252,14 +252,14 @@ 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

        assertScrimAlpha(TRANSPARENT /* front */,

                OPAQUE /* back */,

                TRANSPARENT /* bubble */);



        assertScrimTint(false /* front */,

        assertScrimTint(true /* front */,

                true /* behind */,

                false /* bubble */);