Merge "Fixed NSSL top padding being set below QQS minimum height" into tm-qpr-dev

2023-03-29 21:31:20 +00:00
parent 704b4a2c26 eb3f88d1c4
commit c233636988
1 changed files with 3 additions and 2 deletions
--- 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;
        }