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

Commit a2c62bdf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not add quick settings padding to the content height when in split...

Merge "Do not add quick settings padding to the content height when in split shade mode" into sc-v2-dev am: 009492eb am: 257cdd99

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

Change-Id: Ia565bbbada0defe54d632cb199b6a3b5b0bd1326
parents 4d33f00e 257cdd99
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -1214,7 +1214,14 @@ public class NotificationPanelViewController extends PanelViewController {
            updateClockAppearance();
        }
        if (!onKeyguard) {
            if (mShouldUseSplitNotificationShade) {
                // Quick settings are not on the top of the notifications
                // when in split shade mode (they are on the left side),
                // so we should not add a padding for them
                stackScrollerPadding = 0;
            } else {
                stackScrollerPadding = getUnlockedStackScrollerPadding();
            }
        } else {
            stackScrollerPadding = mClockPositionResult.stackScrollerPaddingExpanded;
        }