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

Commit 38cb397b authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Keep HUN opaque for transition to shade" into sc-dev

parents 6fda8023 a5ebc89c
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -380,12 +380,16 @@ public class StackScrollAlgorithm {
        ExpandableViewState viewState = view.getViewState();
        viewState.location = ExpandableViewState.LOCATION_UNKNOWN;

        final boolean isHunGoingToShade = ambientState.isShadeExpanded()
                && view == ambientState.getTrackedHeadsUpRow();
        if (!isHunGoingToShade) {
            if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
                viewState.alpha = Interpolators.getNotificationScrimAlpha(
                        ambientState.getExpansionFraction(), true /* notification */);
            } else {
                viewState.alpha = 1f - ambientState.getHideAmount();
            }
        }

        if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {
            // Even if we're not scrolled away we're in view and we're also not in the