Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c17ed91 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8 am: b24abb8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910

Change-Id: I9da7d16f7ea12f199cff6fae79189a4b68eea44e
parents 394fc3ac b24abb8f
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -157,15 +157,13 @@ public class StackScrollAlgorithm {
        // 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;