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

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

Change-Id: I66c21d53da583c7287c2bac85b499989a68b0daa
This commit is contained in:
Lucas Dupin
2021-05-26 21:51:44 +00:00
committed by Automerger Merge Worker

View File

@@ -380,11 +380,15 @@ public class StackScrollAlgorithm {
ExpandableViewState viewState = view.getViewState();
viewState.location = ExpandableViewState.LOCATION_UNKNOWN;
if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
viewState.alpha = Interpolators.getNotificationScrimAlpha(
ambientState.getExpansionFraction(), true /* notification */);
} else {
viewState.alpha = 1f - ambientState.getHideAmount();
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) {