Fix disappearing notifications when closing fullscreen QS

We might be setting alpha to 0 for wakeup-related events at that point.
Let's not do that when shade is open. This change adds a keyguard check

Bug: 189313235
Test: manual
Change-Id: Ibc73f71d31f3b10714a9c7ce4bb9a121e497ed5b
This commit is contained in:
Lyn Han
2021-06-01 13:05:40 -05:00
parent f954c84355
commit cc8afa6b50

View File

@@ -382,13 +382,15 @@ public class StackScrollAlgorithm {
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 (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 */);
}
if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {