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

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

Merge "Fixing notification scrim bounds in split shade" into sc-dev am: 0be45a9f 

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

Change-Id: I9d43b681b32f9ac5cd128c7262fc72c7d41886aa
parents 55f111e2 0be45a9f

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

+12 −14
Original line number Diff line number Diff line
@@ -2073,7 +2073,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        setQsExpansionEnabled(mAmbientState.getScrollY() == 0);



        int radius = mScrimCornerRadius;

        if (visible || !mShouldUseSplitNotificationShade) {

        if (!mShouldUseSplitNotificationShade) {

            top = (int) Math.min(qsPanelBottomY, notificationTop);

            bottom = getView().getBottom();
@@ -2081,13 +2080,12 @@ public class NotificationPanelViewController extends PanelViewController { 
            right = getView().getRight();

            radius = (int) MathUtils.lerp(mScreenCornerRadius, mScrimCornerRadius,

                    Math.min(top / (float) mScrimCornerRadius, 1f));

            } else {

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

            top = Math.min(qsPanelBottomY, mSplitShadeNotificationsTopPadding);

            bottom = mNotificationStackScrollLayoutController.getHeight();

            left = mNotificationStackScrollLayoutController.getLeft();

            right = mNotificationStackScrollLayoutController.getRight();

        }

        }



        // Fancy clipping for quick settings

        if (mQs != null) {