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

Commit cf834cf1 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Keep HUN opaque for transition to shade" into sc-dev am: 38cb397b

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

Change-Id: I26b545359073f37e57b83e05ec515aa1e353e16e
parents e1961c4f 38cb397b
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