| commit | b24abb8ff4c3a7bd88bb2289206d857ba6ad30f0 | [log] [tgz] |
|---|---|---|
| author | Jeff DeCew <jeffdq@google.com> | Tue Aug 03 13:39:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 03 13:39:48 2021 +0000 |
| tree | 364b42ad33bf8ca92ebb16fef605de2d265b7dd9 | |
| parent | 9aa7694408e780362614dba6c3be798637384b67 [diff] | |
| parent | 2458c8f8c6c87e01b486335aa9a8715663dcc340 [diff] |
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910 Change-Id: I471c66b754cbabf6f3fec9426f6bcfef6806057f
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;