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

Merge "Keep HUN opaque for transition to shade" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-05-26 21:36:23 +00:00
committed by Android (Google) Code Review
parent 6fda802363 a5ebc89c52
commit 38cb397b8d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -380,11 +380,15 @@ public class StackScrollAlgorithm {
ExpandableViewState viewState = view.getViewState(); ExpandableViewState viewState = view.getViewState();
viewState.location = ExpandableViewState.LOCATION_UNKNOWN; viewState.location = ExpandableViewState.LOCATION_UNKNOWN;
if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) { final boolean isHunGoingToShade = ambientState.isShadeExpanded()
viewState.alpha = Interpolators.getNotificationScrimAlpha( && view == ambientState.getTrackedHeadsUpRow();
ambientState.getExpansionFraction(), true /* notification */); if (!isHunGoingToShade) {
} else { if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
viewState.alpha = 1f - ambientState.getHideAmount(); viewState.alpha = Interpolators.getNotificationScrimAlpha(
ambientState.getExpansionFraction(), true /* notification */);
} else {
viewState.alpha = 1f - ambientState.getHideAmount();
}
} }
if (view.mustStayOnScreen() && viewState.yTranslation >= 0) { if (view.mustStayOnScreen() && viewState.yTranslation >= 0) {