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

Commit f333c551 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Fixing notification scrim shifted in landscape orientation" into sc-dev... 

Merge "Fixing notification scrim shifted in landscape orientation" into sc-dev am: 4b5aa29c am: d0131cec am: 46ecb803

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

Change-Id: If34bbb581be283ebb04b9233f72ccb2ea37206a6
parents 68719f9c 46ecb803

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+4 −2
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private float mDownX;

    private float mDownY;

    private int mDisplayCutoutTopInset = 0; // in pixels

    private int mDisplayCutoutLeftInset = 0; // in pixels

    private int mSplitShadeNotificationsTopPadding;



    private final KeyguardClockPositionAlgorithm
@@ -2174,8 +2175,8 @@ public class NotificationPanelViewController extends PanelViewController { 
                        : notificationTop);

            }

            bottom = getView().getBottom();

            left = getView().getLeft();

            right = getView().getRight();

            left = getView().getLeft() - mDisplayCutoutLeftInset;

            right = getView().getRight() - mDisplayCutoutLeftInset;

        } else if (qsPanelBottomY > 0) { // so bounds are empty on lockscreen

            top = Math.min(qsPanelBottomY, mSplitShadeNotificationsTopPadding);

            bottom = mNotificationStackScrollLayoutController.getHeight();
@@ -4414,6 +4415,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {

            final DisplayCutout displayCutout = v.getRootWindowInsets().getDisplayCutout();

            mDisplayCutoutTopInset = displayCutout != null ? displayCutout.getSafeInsetTop() : 0;

            mDisplayCutoutLeftInset = displayCutout != null ? displayCutout.getSafeInsetLeft() : 0;



            mNavigationBarBottomHeight = insets.getStableInsetBottom();

            updateMaxHeadsUpTranslation();