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

Commit 396acbc6 authored by Josh Tsuji's avatar Josh Tsuji Committed by Android (Google) Code Review
Browse files

Merge "Fade in notifications on wakeup." into sc-dev

parents bf5667be 67306a31
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
                    getFullyClosedTranslation());
            viewState.zTranslation = ambientState.getBaseZHeight();
            viewState.clipTopAmount = 0;
            viewState.alpha = 1;
            viewState.alpha = 1f - ambientState.getHideAmount();
            viewState.belowSpeedBump = mHostLayoutController.getSpeedBumpIndex() == 0;
            viewState.hideSensitive = false;
            viewState.xTranslation = getTranslationX();
+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
        }

        if (mAmbientState.isHiddenAtAll()) {
            clipToOutline = true;
            clipToOutline = false;
            invalidateOutline();
            if (isFullyHidden()) {
                setClipBounds(null);
+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ public class StackScrollAlgorithm {
        }
        int childHeight = getMaxAllowedChildHeight(child);
        childViewState.yTranslation = currentYPosition;
        childViewState.alpha = 1f - ambientState.getHideAmount();

        boolean isFooterView = child instanceof FooterView;
        boolean isEmptyShadeView = child instanceof EmptyShadeView;