Merge "Made sure the headsup doesn't disappear after bypassing" into qt-r1-dev

am: 88bbb2a9f0 Change-Id: I650d6badc8c13ca6edf00578a094d93dbd913213
2019-07-14 20:11:27 -07:00
parent a08b796130 88bbb2a9f0
commit 33a2fbcdde
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
@@ -514,11 +514,11 @@ public class StackScrollAlgorithm {
        for (int i = 0; i < childCount; i++) {
            View child = algorithmState.visibleChildren.get(i);
            if (!(child instanceof ExpandableNotificationRow)) {
-                break;
+                continue;
            }
            ExpandableNotificationRow row = (ExpandableNotificationRow) child;
            if (!row.isHeadsUp()) {
-                break;
+                continue;
            }
            ExpandableViewState childState = row.getViewState();
            if (topHeadsUpEntry == null && row.mustStayOnScreen() && !childState.headsUpIsVisible) {