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

Commit 9e5ed535 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could... 

am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev

* commit '0f700f8c65979609242d3a18db412a0ce561eccb':
  Fixed an issue where holes in the notification shade could appear.
parents 0cc9c1e9 429b1ab5

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+5 −0
Original line number Diff line number Diff line
@@ -258,4 +258,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
    public void notifyContentUpdated() {

        mPrivateLayout.notifyContentUpdated();

    }



    public boolean isShowingLayoutLayouted() {

        View showingLayout = mShowingPublic ? mPublicLayout : mPrivateLayout;

        return showingLayout.getWidth() != 0;

    }

}

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

+9 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ public class StackScrollAlgorithm { 
            } else {



                // We are expanding the shade, expand it to its full height.

                if (mFirstChildWhileExpanding.getWidth() == 0) {

                if (!isMaxSizeInitialized(mFirstChildWhileExpanding)) {



                    // This child was not layouted yet, wait for a layout pass

                    mFirstChildWhileExpanding
@@ -689,6 +689,14 @@ public class StackScrollAlgorithm { 
        }

    }



    private boolean isMaxSizeInitialized(ExpandableView child) {

        if (child instanceof ExpandableNotificationRow) {

            ExpandableNotificationRow row = (ExpandableNotificationRow) child;

            return row.isShowingLayoutLayouted();

        }

        return child == null || child.getWidth() != 0;

    }



    private View findFirstVisibleChild(ViewGroup container) {

        int childCount = container.getChildCount();

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