Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6ce3f118621fc92d7d54cacbf96fa0c85fe8384b
This commit is contained in:
Lyn Han
2021-06-02 15:40:32 +00:00
committed by Automerger Merge Worker
parent 74be236dd6 4f8ddb3022
commit a2bb23a275
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,13 +382,15 @@ public class StackScrollAlgorithm {
final boolean isHunGoingToShade = ambientState.isShadeExpanded() final boolean isHunGoingToShade = ambientState.isShadeExpanded()
&& view == ambientState.getTrackedHeadsUpRow(); && view == ambientState.getTrackedHeadsUpRow();
if (!isHunGoingToShade) { if (isHunGoingToShade) {
if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) { // Keep 100% opacity for heads up notification going to shade.
viewState.alpha = Interpolators.getNotificationScrimAlpha( } else if (ambientState.isOnKeyguard()) {
ambientState.getExpansionFraction(), true /* notification */); // Adjust alpha for wakeup to lockscreen.
} else { viewState.alpha = 1f - ambientState.getHideAmount();
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) { if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {