From cb612eeb7743e6dc7a41456fd14650a5d0e604a1 Mon Sep 17 00:00:00 2001
From: Michal Brzezinski <brzezinski@google.com>
Date: Wed, 13 Apr 2022 17:51:15 +0100
Subject: [PATCH] Quick fix for notification scrim showing when swiping up the
 bouncer

This fix is disabling activating mQsExpandImmediate on lockscreen. This might be even long term fix as this callback is not activated on lockscreen when we actually want it to anyway - so it works on lockscreen but only when it's not desired.

Fixes: 228607886
Test: manual
Change-Id: Iaeee17391894f4e3a0bd617ca6b8133f0b9718e4
---
 .../statusbar/phone/NotificationPanelViewController.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index a6b5c4d2c92c4..c4a9c17bb1fe8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -3173,7 +3173,10 @@ public class NotificationPanelViewController extends PanelViewController {
         mFalsingCollector.onTrackingStarted(!mKeyguardStateController.canDismissLockScreen());
         super.onTrackingStarted();
         mScrimController.onTrackingStarted();
-        if (mShouldUseSplitNotificationShade) {
+        // normally we want to set mQsExpandImmediate for every split shade case (at least when
+        // expanding), but keyguard tracking logic is different - this callback is called when
+        // unlocking with swipe up but not when swiping down to reveal shade
+        if (mShouldUseSplitNotificationShade && !mKeyguardShowing) {
             mQsExpandImmediate = true;
         }
         if (mQsFullyExpanded) {