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

Commit 573e85ff authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge \"Fix smooth panel deceleration\" into nyc-dev 

am: e8584322

Change-Id: I2520d88620d5f3f12cab60a9422db8a41e40bec8
parents 157c6811 e8584322

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -154,8 +154,8 @@ public class StackScrollAlgorithm { 
            float newNotificationEnd = newYTranslation + newHeight;

            float newNotificationEnd = newYTranslation + newHeight;

            boolean isHeadsUp = (child instanceof ExpandableNotificationRow)

            boolean isHeadsUp = (child instanceof ExpandableNotificationRow)

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

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

            if (newYTranslation < previousNotificationEnd && ambientState.isShadeExpanded()

            if (newYTranslation < previousNotificationEnd

                    && !isHeadsUp) {

                    && (!isHeadsUp || ambientState.isShadeExpanded())) {

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

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

                float overlapAmount = previousNotificationEnd - newYTranslation;

                float overlapAmount = previousNotificationEnd - newYTranslation;

                state.clipTopAmount = (int) overlapAmount;

                state.clipTopAmount = (int) overlapAmount;