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

Commit 4f8ddb30 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix disappearing notifications when closing fullscreen QS" into sc-dev am: 68f26fd9 

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

Change-Id: I695f7144f09fe85c1c4a00d8dced86dc31cea5b7
parents 5fc09fde 68f26fd9

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

+9 −7
Original line number Diff line number Diff line
@@ -382,13 +382,15 @@ public class StackScrollAlgorithm { 


        final boolean isHunGoingToShade = ambientState.isShadeExpanded()

                && view == ambientState.getTrackedHeadsUpRow();

        if (!isHunGoingToShade) {

            if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {

        if (isHunGoingToShade) {

            // Keep 100% opacity for heads up notification going to shade.

        } else if (ambientState.isOnKeyguard()) {

            // Adjust alpha for wakeup to lockscreen.

            viewState.alpha = 1f - ambientState.getHideAmount();

        } else if (ambientState.isExpansionChanging()) {

            // Adjust alpha for shade open & close.

            viewState.alpha = Interpolators.getNotificationScrimAlpha(

                    ambientState.getExpansionFraction(), true /* notification */);

            } else {

                viewState.alpha = 1f - ambientState.getHideAmount();

            }

        }



        if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {