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

This commit is contained in:
Josh Tsuji
2021-03-31 22:48:07 +00:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 2 deletions

View File

@@ -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();

View File

@@ -1245,7 +1245,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
}
if (mAmbientState.isHiddenAtAll()) {
clipToOutline = true;
clipToOutline = false;
invalidateOutline();
if (isFullyHidden()) {
setClipBounds(null);

View File

@@ -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;