summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mady Mellor <madym@google.com> 2021-04-26 12:30:21 -0700
committer Mady Mellor <madym@google.com> 2021-04-26 20:08:37 +0000
commit3b68dba36f5aac83081ca1c2bd498f44f399aeb3 (patch)
treec4e951f293edc6bb1caf252f60f01b440e038833
parent681f269d78b8580ec7a430b12ae70c7e0308182e (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java2
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java2
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 a9774d850fd9..c3496ea1c987 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 8633eb466b6c..0ae89dfa96e8 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