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

Commit 73bfdd9e authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[flexiglass] Fix footer not appearing on the locked shade 

This was happening because the StackScrollAlgorithm thought that there's
not enough space for the footer.

Fix: 364028944
Test: open locked shade and verify that footer is showing
Flag: com.android.systemui.scene_container
Change-Id: Ic33469f02babbb52d52e03ccd443b78ab3280fd2
parent 5bafeec5

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+21 −13
Original line number Diff line number Diff line
@@ -677,23 +677,31 @@ public class StackScrollAlgorithm { 
        );

        if (view instanceof FooterView) {

            if (FooterViewRefactor.isEnabled()) {

                if (SceneContainerFlag.isEnabled()) {

                    final float footerEnd =

                            stackTop + viewState.getYTranslation() + view.getIntrinsicHeight();

                    final boolean noSpaceForFooter = footerEnd > ambientState.getStackCutoff();

                    ((FooterView.FooterViewState) viewState).hideContent =

                            noSpaceForFooter || (ambientState.isClearAllInProgress()

                                    && !hasNonClearableNotifs(algorithmState));

                } else {

                    // TODO(b/333445519): shouldBeHidden should reflect whether the shade is closed

                //  already, so we shouldn't need to use ambientState here. However, currently it

                //  doesn't get updated quickly enough and can cause the footer to flash when

                //  closing the shade. As such, we temporarily also check the ambientState directly.

                    //  already, so we shouldn't need to use ambientState here. However,

                    //  currently it doesn't get updated quickly enough and can cause the footer to

                    //  flash when closing the shade. As such, we temporarily also check the

                    //  ambientState directly.

                    if (((FooterView) view).shouldBeHidden() || !ambientState.isShadeExpanded()) {

                    // Note: This is no longer necessary in flexiglass.

                    if (!SceneContainerFlag.isEnabled()) {

                        viewState.hidden = true;

                    }

                    } else {

                        final float footerEnd = algorithmState.mCurrentExpandedYPosition

                                + view.getIntrinsicHeight();

                    final boolean noSpaceForFooter = footerEnd > ambientState.getStackEndHeight();

                        final boolean noSpaceForFooter =

                                footerEnd > ambientState.getStackEndHeight();

                        ((FooterView.FooterViewState) viewState).hideContent =

                                noSpaceForFooter || (ambientState.isClearAllInProgress()

                                        && !hasNonClearableNotifs(algorithmState));

                    }

                }

            } else {

                final boolean shadeClosed = !ambientState.isShadeExpanded();

                final boolean isShelfShowing = algorithmState.firstViewInShelf != null;