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

Commit 0b863c75 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14363664] into sc-release 

Change-Id: If3ced80969d83b72126758cae5ac81fa0ee6c1b4
parents 412bbff5 3b9c828a

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

+5 −2
Original line number Diff line number Diff line
@@ -151,7 +151,9 @@ public class StackScrollAlgorithm { 


    private void updateClipping(StackScrollAlgorithmState algorithmState,

            AmbientState ambientState) {

        float drawStart = !ambientState.isOnKeyguard() ? ambientState.getStackY() : 0;

        float drawStart = !ambientState.isOnKeyguard() ? ambientState.getTopPadding()

                + ambientState.getStackTranslation()

                : 0;

        float clipStart = 0;

        int childCount = algorithmState.visibleChildren.size();

        boolean firstHeadsUp = true;
@@ -164,7 +166,8 @@ public class StackScrollAlgorithm { 
            float newYTranslation = state.yTranslation;

            float newHeight = state.height;

            float newNotificationEnd = newYTranslation + newHeight;

            boolean isHeadsUp = (child instanceof ExpandableNotificationRow) && child.isPinned();

            boolean isHeadsUp = (child instanceof ExpandableNotificationRow)

                    && ((ExpandableNotificationRow) child).isPinned();

            if (mClipNotificationScrollToTop

                    && (!state.inShelf || (isHeadsUp && !firstHeadsUp))

                    && newYTranslation < clipStart