From c31ddde1df2a539eb83fb2e451f22fad42f69673 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Fri, 5 Mar 2021 16:00:45 -0800 Subject: Add alpha back to bubble scrim Test: atest ScrimControllerTest Test: manual - expand bubble stack, observe scrim Fixes: 181791886 Change-Id: I254856cd9f0775bb52cb47197d78e40d78853b38 --- .../com/android/systemui/statusbar/phone/ScrimController.java | 9 +++++++-- .../android/systemui/statusbar/phone/ScrimControllerTest.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 7b2330bdcd6e..270a0f8c5d5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -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; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java index 21368d6d5309..b1f1b5e78b5c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java @@ -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); } -- cgit v1.2.3-59-g8ed1b