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

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

Merge "Fixing HUN translation and clipping when swiping up in split shade"... 

Merge "Fixing HUN translation and clipping when swiping up in split shade" into tm-qpr-dev am: 32e574fe am: 52f48fc8

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



Change-Id: Ia3ff65b33fec71a16859b4d949c2f8fd1d2ba60b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aec7373f 52f48fc8

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −13
Original line number Diff line number Diff line
@@ -1401,10 +1401,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            mExpandedHeight = height;

            setIsExpanded(height > 0);

            int minExpansionHeight = getMinExpansionHeight();

            if (height < minExpansionHeight) {

            if (height < minExpansionHeight && !mShouldUseSplitNotificationShade) {

                mClipRect.left = 0;

                mClipRect.right = getWidth();

                mClipRect.top = getNotificationsClippingTopBound();

                mClipRect.top = 0;

                mClipRect.bottom = (int) height;

                height = minExpansionHeight;

                setRequestedClipBounds(mClipRect);
@@ -1466,17 +1466,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        notifyAppearChangedListeners();

    }



    private int getNotificationsClippingTopBound() {

        if (isHeadsUpTransition()) {

            // HUN in split shade can go higher than bottom of NSSL when swiping up so we want

            // to give it extra clipping margin. Because clipping has rounded corners, we also

            // need to account for that corner clipping.

            return -mAmbientState.getStackTopMargin() - mCornerRadius;

        } else {

            return 0;

        }

    }



    private void notifyAppearChangedListeners() {

        float appear;

        float expandAmount;