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

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

Merge "Removing unnecessary QuickSettings clip bounds in split shade" into sc-dev am: 43800464 

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

Change-Id: I656177f09fe6658f33477d7db21a9675e8ab57e6
parents fa4c9a70 43800464

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

+6 −5
Original line number Diff line number Diff line
@@ -2060,7 +2060,8 @@ public class NotificationPanelViewController extends PanelViewController { 
        int bottom = 0;

        int left = 0;

        int right = 0;

        boolean visible = qsFraction > 0 || qsPanelBottomY > 0;

        boolean visible = (qsFraction > 0 || qsPanelBottomY > 0)

                && !mShouldUseSplitNotificationShade;

        int radius = mScrimCornerRadius;

        if (visible || !mShouldUseSplitNotificationShade) {

            if (!mShouldUseSplitNotificationShade) {
@@ -2079,11 +2080,11 @@ public class NotificationPanelViewController extends PanelViewController { 
            }

        }



        if (!mShouldUseSplitNotificationShade) {

        // Fancy clipping for quick settings

        if (mQs != null) {

            mQs.setFancyClipping(top, bottom, radius, visible);

        }

        if (!mShouldUseSplitNotificationShade) {

            // The padding on this area is large enough that we can use a cheaper clipping strategy

            mKeyguardStatusAreaClipBounds.set(left, top, right, bottom);

            mKeyguardStatusViewController.setClipBounds(visible