From d9da03559630c58e5c9a0db6f469da09277d8da6 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Tue, 24 Aug 2021 09:25:03 -0400
Subject: [PATCH] Always use light reveal scrim

It's used as the Doze background, so even
if AOD isn't enabled, we still want it for
the bg to the DOCKED state.

Test: manual
Fixes: 191525374
Change-Id: Ib9a7a80dd2f2a9cfb00935c28d23cee0fe13c657
---
 packages/SystemUI/res/layout/super_notification_shade.xml | 3 +--
 .../com/android/systemui/statusbar/phone/StatusBar.java   | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/SystemUI/res/layout/super_notification_shade.xml b/packages/SystemUI/res/layout/super_notification_shade.xml
index bea50e87a29a0..71e8fc9991ed1 100644
--- a/packages/SystemUI/res/layout/super_notification_shade.xml
+++ b/packages/SystemUI/res/layout/super_notification_shade.xml
@@ -62,8 +62,7 @@
     <com.android.systemui.statusbar.LightRevealScrim
             android:id="@+id/light_reveal_scrim"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone" />
+            android:layout_height="match_parent" />
 
     <include layout="@layout/status_bar_expanded"
         android:layout_width="match_parent"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 353300f3848af..d31d81e18ed82 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -1044,7 +1044,7 @@ public class StatusBar extends SystemUI implements DemoMode,
                 mNotificationShadeWindowViewController,
                 mNotificationPanelViewController,
                 mAmbientIndicationContainer);
-        mDozeParameters.addCallback(this::updateLightRevealScrimVisibility);
+        updateLightRevealScrimVisibility();
 
         mConfigurationController.addCallback(this);
 
@@ -4956,11 +4956,5 @@ public class StatusBar extends SystemUI implements DemoMode,
         }
 
         mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha());
-        if (mFeatureFlags.useNewLockscreenAnimations()
-                && (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
-            mLightRevealScrim.setVisibility(View.VISIBLE);
-        } else {
-            mLightRevealScrim.setVisibility(View.GONE);
-        }
     }
 }