Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 702c2712 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Fixed NSSL top padding being set below QQS minimum height" into... 

Merge "Fixed NSSL top padding being set below QQS minimum height" into tm-qpr-dev am: c2336369 am: 9c49e47f am: 46f1d1b8 am: f0f854f5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22338124



Change-Id: Ib72398a0378d9f1ec829eb91f576db6f0c96092c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1eb88df8 f0f854f5

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

+3 −2
Original line number Diff line number Diff line
@@ -1309,8 +1309,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;

        }