summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java5
1 files 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 ac7b4c236ef1..2efc23b87da4 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;
}