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

This commit is contained in:
Shawn Lee
2023-03-29 21:31:20 +00:00
committed by Android (Google) Code Review

View File

@@ -1271,8 +1271,9 @@ public class QuickSettingsController {
logNotificationsTopPadding("keyguard", topPadding); logNotificationsTopPadding("keyguard", topPadding);
return topPadding; return topPadding;
} else { } else {
topPadding = mQsFrameTranslateController.getNotificationsTopPadding( topPadding = Math.max(mQsFrameTranslateController.getNotificationsTopPadding(
mExpansionHeight, mNotificationStackScrollLayoutController); mExpansionHeight, mNotificationStackScrollLayoutController),
mQuickQsHeaderHeight);
logNotificationsTopPadding("default case", topPadding); logNotificationsTopPadding("default case", topPadding);
return topPadding; return topPadding;
} }