From bed558989bb9ae1a9db551d5ffcc7d1163b59741 Mon Sep 17 00:00:00 2001
From: Lucas Silva <lusilva@google.com>
Date: Thu, 1 Sep 2022 10:22:15 -0400
Subject: [PATCH] Disable notification shade close animation when occluded.

This is causing a flicker when an activity opens over keyguard. The
keyguard is occluded by the activity, so we shouldn't animate behind the
occlusion.

Bug: 242860396
Test: manually on device when opening showWhenLocked activity over the
keyguard

Change-Id: Ie57a69815bf7a9460b0f90408010535eb9b9e172
---
 .../systemui/statusbar/phone/StatusBarKeyguardViewManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index d5c6f89bfb6b1..f106e54a091b4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -589,7 +589,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     public void reset(boolean hideBouncerWhenShowing) {
         if (mShowing) {
             // Hide quick settings.
-            mNotificationPanelViewController.resetViews(/* animate= */ true);
+            mNotificationPanelViewController.resetViews(/* animate= */ !mOccluded);
             // Hide bouncer and quick-quick settings.
             if (mOccluded && !mDozing) {
                 mCentralSurfaces.hideKeyguard();