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

Commit 369a0d84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unneeded isShadeOpening check when clipping bottom HUN" into tm-dev am: c2da1090 

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

Change-Id: Ia8c47caf8fd491080d97ab9ea0276df8efb2921e
parents 364877df c2da1090

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

+1 −3
Original line number Diff line number Diff line
@@ -202,12 +202,10 @@ public class StackScrollAlgorithm { 
            float newHeight = state.height;

            float newNotificationEnd = newYTranslation + newHeight;

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

            final boolean shadeClosedWithHUN =

                    ambientState.isShadeOpening() && !ambientState.isShadeExpanded();

            if (mClipNotificationScrollToTop

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

                    && newYTranslation < clipStart

                    && shadeClosedWithHUN) {

                    && !ambientState.isShadeExpanded()) {

                // The previous view is overlapping on top, clip!

                float overlapAmount = clipStart - newYTranslation;

                state.clipTopAmount = (int) overlapAmount;