diff options
| author | 2017-12-11 17:21:37 +0000 | |
|---|---|---|
| committer | 2017-12-11 17:21:37 +0000 | |
| commit | 3ddcbc6c539b93bb70bed2a6ec67f0fdbee4b654 (patch) | |
| tree | 5346394dd8fc6402ac0f89c02d9b226b96a227ff | |
| parent | 27674aedc0c2fe6f013ea0d6722bdb0d17fc7c57 (diff) | |
| parent | 61cfd4bcd88d6ae185356cef0b3dc827c93c02dd (diff) | |
Merge "Fixed a crash with the top headsup entry"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java index 195607dce81f..7374f115a19b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java @@ -448,7 +448,7 @@ public class StackScrollAlgorithm { childState.height = Math.max(row.getIntrinsicHeight(), childState.height); childState.hidden = false; ExpandableViewState topState = resultState.getViewStateForView(topHeadsUpEntry); - if (!isTopEntry && (!mIsExpanded + if (topState != null && !isTopEntry && (!mIsExpanded || unmodifiedEndLocation < topState.yTranslation + topState.height)) { // Ensure that a headsUp doesn't vertically extend further than the heads-up at // the top most z-position |