From 3b68dba36f5aac83081ca1c2bd498f44f399aeb3 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 26 Apr 2021 12:30:21 -0700
Subject: [PATCH] Make bubble scrim be dark always

When the scrim is lighter & the pointer triangle is also
white, it's very hard to see and will not pass GAR.

Bug: 186441337
Test: atest ScrimControllerTest
Test: manual - expand bubble in dark & light theme on top of launcher
               and on top of some other app
             => notice scrim is always dark & pointer triangle is
                slightly more visible
Change-Id: I5e5c191bb813dc272284daf11e76c02ba17dc375
---
 .../src/com/android/systemui/statusbar/phone/ScrimState.java    | 2 +-
 .../android/systemui/statusbar/phone/ScrimControllerTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index a9774d850fd92..c3496ea1c987b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -264,7 +264,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;
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 8633eb466b6ce..0ae89dfa96e81 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
@@ -553,7 +553,7 @@ public class ScrimControllerTest extends SysuiTestCase {
         assertScrimTinted(Map.of(
                 mScrimInFront, false,
                 mScrimBehind, false,
-                mScrimForBubble, false
+                mScrimForBubble, true
         ));
 
         // Front scrim should be transparent