diff options
| author | 2023-03-30 16:40:43 +0000 | |
|---|---|---|
| committer | 2023-03-30 16:40:43 +0000 | |
| commit | 9c49e47f62f5100f66b535a6ba551eca1ff91255 (patch) | |
| tree | 0cac4a9f0c09575801ec3a4b11181820615ec75e | |
| parent | 2c67f7ed0061baa22f982807ffd7f7365b13ae18 (diff) | |
| parent | c23363698815c93c19e66aa9067fd4bf3e6999b9 (diff) | |
Merge "Fixed NSSL top padding being set below QQS minimum height" into tm-qpr-dev am: c233636988
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22338124
Change-Id: Ibc638f80a40cee0286296c1fc1d9ffc87f5d1221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java | 5 |
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; } |