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

Commit 0bc5a6b6 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug when swiping out notifications when scrolled."

parents 0002a450 d7c4e004

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

+9 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
     */

    private void updateScrollStateForRemovedChild(View removedChild) {

        int startingPosition = getPositionInLinearLayout(removedChild);

        int childHeight = removedChild.getHeight() + mPaddingBetweenElements;

        int childHeight = getIntrinsicHeight(removedChild) + mPaddingBetweenElements;

        int endPosition = startingPosition + childHeight;

        if (endPosition <= mOwnScrollY) {

            // This child is fully scrolled of the top, so we have to deduct its height from the
@@ -1462,6 +1462,14 @@ public class NotificationStackScrollLayout extends ViewGroup 
        }

    }



    private int getIntrinsicHeight(View view) {

        if (view instanceof ExpandableView) {

            ExpandableView expandableView = (ExpandableView) view;

            return expandableView.getIntrinsicHeight();

        }

        return view.getHeight();

    }



    private int getPositionInLinearLayout(View requestedChild) {

        int position = 0;

        for (int i = 0; i < getChildCount(); i++) {