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

Commit a90362eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add alpha back to bubble scrim" into sc-dev am: 7af559a6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae8bfb662432a5957f4b2ffaa65da083e0263a4b
parents ce0ca12b 7af559a6

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

+7 −2
Original line number Diff line number Diff line
@@ -123,6 +123,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
     */

    public static final float BUSY_SCRIM_ALPHA = 1f;



    /**

     * The default scrim under the expanded bubble stack.

     * This should not be lower than 0.54, otherwise we won't pass GAR.

     */

    public static final float BUBBLE_SCRIM_ALPHA = 0.6f;



    /**

     * Scrim opacity that can have text on top.

     */
@@ -207,8 +213,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
            FeatureFlags featureFlags, @Main Executor mainExecutor) {

        mScrimStateListener = lightBarController::setScrimState;

        mDefaultScrimAlpha = featureFlags.isShadeOpaque() ? BUSY_SCRIM_ALPHA : GAR_SCRIM_ALPHA;

        ScrimState.BUBBLE_EXPANDED.setBubbleAlpha(featureFlags.isShadeOpaque()

                ? BUSY_SCRIM_ALPHA : GAR_SCRIM_ALPHA);

        ScrimState.BUBBLE_EXPANDED.setBubbleAlpha(BUBBLE_SCRIM_ALPHA);

        mBlurUtils = blurUtils;



        mKeyguardStateController = keyguardStateController;

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

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
        Assert.assertEquals(ScrimController.BUSY_SCRIM_ALPHA,

                mScrimBehind.getViewAlpha(), 0.0f);

        // Bubble scrim should be visible

        Assert.assertEquals(ScrimController.BUSY_SCRIM_ALPHA,

        Assert.assertEquals(ScrimController.BUBBLE_SCRIM_ALPHA,

                mScrimForBubble.getViewAlpha(), 0.0f);

    }