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

Commit 934ed9b3 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Make bubble scrim be dark always" into sc-dev am: b858b41f 

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

Change-Id: I94d6871fcc4ceec20c54f5cfcfcb0810cf5f47a8
parents ee83b95c b858b41f

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

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ public enum ScrimState { 
        public void prepare(ScrimState previousState) {

            mFrontTint = Color.TRANSPARENT;

            mBehindTint = Color.TRANSPARENT;

            mBubbleTint = Color.TRANSPARENT;

            mBubbleTint = Color.BLACK;



            mFrontAlpha = 0f;

            mBehindAlpha = mDefaultScrimAlpha;

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

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
        assertScrimTinted(Map.of(

                mScrimInFront, false,

                mScrimBehind, false,

                mScrimForBubble, false

                mScrimForBubble, true

        ));



        // Front scrim should be transparent