Merge "Do not show footer when shade is closed" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-05-26 19:18:26 +00:00
committed by Android (Google) Code Review

View File

@@ -414,13 +414,15 @@ public class StackScrollAlgorithm {
} }
if (view instanceof FooterView) { if (view instanceof FooterView) {
final boolean shadeClosed = !ambientState.isShadeExpanded();
final boolean isShelfShowing = algorithmState.firstViewInShelf != null; final boolean isShelfShowing = algorithmState.firstViewInShelf != null;
final float footerEnd = algorithmState.mCurrentExpandedYPosition final float footerEnd = algorithmState.mCurrentExpandedYPosition
+ view.getIntrinsicHeight(); + view.getIntrinsicHeight();
final boolean noSpaceForFooter = footerEnd > ambientState.getStackEndHeight(); final boolean noSpaceForFooter = footerEnd > ambientState.getStackEndHeight();
viewState.hidden = isShelfShowing || noSpaceForFooter; viewState.hidden = shadeClosed || isShelfShowing || noSpaceForFooter;
} else if (view != ambientState.getTrackedHeadsUpRow()) { } else if (view != ambientState.getTrackedHeadsUpRow()) {
if (ambientState.isExpansionChanging()) { if (ambientState.isExpansionChanging()) {
// Show all views. Views below the shelf will later be clipped (essentially hidden) // Show all views. Views below the shelf will later be clipped (essentially hidden)