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

am: 88bbb2a9f0

Change-Id: I650d6badc8c13ca6edf00578a094d93dbd913213
This commit is contained in:
Selim Cinek
2019-07-14 20:11:27 -07:00
committed by android-build-merger

View File

@@ -514,11 +514,11 @@ public class StackScrollAlgorithm {
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
View child = algorithmState.visibleChildren.get(i); View child = algorithmState.visibleChildren.get(i);
if (!(child instanceof ExpandableNotificationRow)) { if (!(child instanceof ExpandableNotificationRow)) {
break; continue;
} }
ExpandableNotificationRow row = (ExpandableNotificationRow) child; ExpandableNotificationRow row = (ExpandableNotificationRow) child;
if (!row.isHeadsUp()) { if (!row.isHeadsUp()) {
break; continue;
} }
ExpandableViewState childState = row.getViewState(); ExpandableViewState childState = row.getViewState();
if (topHeadsUpEntry == null && row.mustStayOnScreen() && !childState.headsUpIsVisible) { if (topHeadsUpEntry == null && row.mustStayOnScreen() && !childState.headsUpIsVisible) {