From 6c19a8d39a215e39765fdce0932c32605c98d2f0 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Wed, 21 Apr 2021 09:00:47 -0400
Subject: [PATCH] Controls - All blacks

Control background must be all black for proper contrast. Make sure
the window and status bar stay that way.

Fixes: 185980818
Test: manual
Change-Id: I7fa1e864968f6f55f4ef4058eaec709019c3bd93
---
 packages/SystemUI/res/layout/controls_fullscreen.xml | 3 +--
 packages/SystemUI/res/values/styles.xml              | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/controls_fullscreen.xml b/packages/SystemUI/res/layout/controls_fullscreen.xml
index 1b2d2e2e9c89b..7fd029cb2c1e2 100644
--- a/packages/SystemUI/res/layout/controls_fullscreen.xml
+++ b/packages/SystemUI/res/layout/controls_fullscreen.xml
@@ -20,8 +20,7 @@
     android:id="@+id/control_detail_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@android:color/black">
+    android:orientation="vertical">
 
   <com.android.systemui.globalactions.MinHeightScrollView
       android:layout_width="match_parent"
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 43c4465dd7482..885227b556ac6 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -678,9 +678,9 @@
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowContentTransitions">false</item>
         <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/black</item>
         <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:statusBarColor">@*android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/black</item>
         <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
     </style>