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

Commit 126cc965 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 am:...

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

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

Change-Id: I533ff3ecf1226db96498e94fd9243a00e9f90989
parents 3dd3a02a 83836d8c
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