summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2019-07-14 20:11:27 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-14 20:11:27 -0700
commit33a2fbcdde297f313ad9e6b319d15890f47473b0 (patch)
tree2981279f76e1c2a5a2b28d4a640c55c2ae15eb90
parenta08b796130de57e133d73edf54bb80201e6f5238 (diff)
parent88bbb2a9f0f7926dba89d751a1326fd1258ab3b4 (diff)
Merge "Made sure the headsup doesn't disappear after bypassing" into qt-r1-dev
am: 88bbb2a9f0 Change-Id: I650d6badc8c13ca6edf00578a094d93dbd913213
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
index 35ba801c75ba..01e2b28600db 100644
--- 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) {