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>
This commit is contained in:
Shawn Lee
2023-03-30 16:40:43 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}