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

Commit 16da545f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not show footer when shade is closed" into sc-dev am: 0e09a244 am:... 

Merge "Do not show footer when shade is closed" into sc-dev am: 0e09a244 am: 89f765a9 am: 84c4094a

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

Change-Id: I7dab6241b3e9f6a84846e6cfde0a28330cde67f7
parents 53d1050c 84c4094a

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

+3 −1
Original line number Diff line number Diff line
@@ -414,13 +414,15 @@ public class StackScrollAlgorithm { 
        }



        if (view instanceof FooterView) {

            final boolean shadeClosed = !ambientState.isShadeExpanded();

            final boolean isShelfShowing = algorithmState.firstViewInShelf != null;



            final float footerEnd = algorithmState.mCurrentExpandedYPosition

                    + view.getIntrinsicHeight();

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



            viewState.hidden = isShelfShowing || noSpaceForFooter;

            viewState.hidden = shadeClosed || isShelfShowing || noSpaceForFooter;



        } else if (view != ambientState.getTrackedHeadsUpRow()) {

            if (ambientState.isExpansionChanging()) {

                // Show all views. Views below the shelf will later be clipped (essentially hidden)