From 9c36b2e955cf7e6f6a6b2c1b9962e8cc3e5e5353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Go=CC=88llner?= <chrisgollner@google.com>
Date: Tue, 17 Jan 2023 15:49:22 +0100
Subject: [PATCH] Split-shade: show status bar earlier when closing shade

There was already a mechanism do start showing the status bar given a
certain shade expansion, but it was disabled for split shade.
This would make the status bar only show after the shade had been fully
closed.

I removed the restriction, and now it works as expected.

Test: Manually on-device. See video in comment.
Fixes: 245613188
Change-Id: I0796881bc868ebdcc57f3b52ac57ac584b16f5bd
---
 .../systemui/shade/NotificationPanelViewController.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index ecaabce70f8af..020045e603fa5 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -4141,9 +4141,7 @@ public final class NotificationPanelViewController implements Dumpable {
     }
 
     private void updateStatusBarIcons() {
-        boolean showIconsWhenExpanded =
-                (isPanelVisibleBecauseOfHeadsUp() || mIsFullWidth)
-                        && getExpandedHeight() < getOpeningHeight();
+        boolean showIconsWhenExpanded = getExpandedHeight() < getOpeningHeight();
         if (showIconsWhenExpanded && isOnKeyguard()) {
             showIconsWhenExpanded = false;
         }
@@ -4210,7 +4208,7 @@ public final class NotificationPanelViewController implements Dumpable {
                 && mHeadsUpAppearanceController.shouldBeVisible()) {
             return false;
         }
-        return !mIsFullWidth || !mShowIconsWhenExpanded;
+        return !mShowIconsWhenExpanded;
     }
 
     private void onQsPanelScrollChanged(int scrollY) {