From eb3f88d1c4db23abea5ac60eebee296574341bcf Mon Sep 17 00:00:00 2001
From: Shawn Lee <syeonlee@google.com>
Date: Wed, 29 Mar 2023 08:55:03 -0700
Subject: [PATCH] Fixed NSSL top padding being set below QQS minimum height

The issue would become apparent in locktask ui mode, where
QQS tiles are hidden. The NSSL top padding and notif scrim
clipping would be misaligned.

Bug: 272414812
Test: manual
Change-Id: I242aeeddc681a0e0b98b664084f3add98d97bac3
---
 .../com/android/systemui/shade/QuickSettingsController.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
index ac7b4c236ef1c..2efc23b87da4b 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
@@ -1271,8 +1271,9 @@ public class QuickSettingsController {
             logNotificationsTopPadding("keyguard", topPadding);
             return topPadding;
         } else {
-            topPadding = mQsFrameTranslateController.getNotificationsTopPadding(
-                    mExpansionHeight, mNotificationStackScrollLayoutController);
+            topPadding = Math.max(mQsFrameTranslateController.getNotificationsTopPadding(
+                    mExpansionHeight, mNotificationStackScrollLayoutController),
+                    mQuickQsHeaderHeight);
             logNotificationsTopPadding("default case", topPadding);
             return topPadding;
         }