| commit | c5d060650962a8ad23aa8e8c9aa4bec83b956fe2 | [log] [tgz] |
|---|---|---|
| author | Jeff DeCew <jeffdq@google.com> | Tue Aug 03 13:49:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 03 13:49:32 2021 +0000 |
| tree | 6401f5a6b95df836c49cb6ce061766c3074f2345 | |
| parent | 44cb7f80802b01d54fad78811a5fee473aaeb9e1 [diff] | |
| parent | 052e6636a54cb998d65e0b66ea5a007b039e0a46 [diff] |
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 052e6636a5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910 Change-Id: I984d32448382e742c18ea2b231a42525fe68e375
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 1b4ae9e..2c810c9 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
@@ -157,15 +157,13 @@ // After the shelf has updated its yTranslation, explicitly set alpha=0 for view below shelf // to skip rendering them in the hardware layer. We do not set them invisible because that // runs invalidate & onDraw when these views return onscreen, which is more expensive. + if (shelf.getViewState().hidden) { + // When the shelf is hidden, it won't clip views, so we don't hide rows + return; + } final float shelfTop = shelf.getViewState().yTranslation; for (ExpandableView view : algorithmState.visibleChildren) { - if (view instanceof ExpandableNotificationRow) { - ExpandableNotificationRow row = (ExpandableNotificationRow) view; - if (row.isHeadsUp() || row.isHeadsUpAnimatingAway()) { - continue; - } - } final float viewTop = view.getViewState().yTranslation; if (viewTop >= shelfTop) { view.getViewState().alpha = 0;