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

Merge "Correct comments in StackScrollAlgorithm" into tm-qpr-dev

Browse Source
This commit is contained in:
Yining Liu
2023-02-16 00:56:51 +00:00
committed by Android (Google) Code Review
parent 8729fae6fd e42a900eff
commit b6128c6b5e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -894,20 +894,19 @@ public class StackScrollAlgorithm {
ExpandableViewState childViewState = child.getViewState(); ExpandableViewState childViewState = child.getViewState();
float baseZ = ambientState.getBaseZHeight(); float baseZ = ambientState.getBaseZHeight();
// Handles HUN shadow when Shade is opened
if (child.mustStayOnScreen() && !childViewState.headsUpIsVisible if (child.mustStayOnScreen() && !childViewState.headsUpIsVisible
&& !ambientState.isDozingAndNotPulsing(child) && !ambientState.isDozingAndNotPulsing(child)
&& childViewState.getYTranslation() < ambientState.getTopPadding() && childViewState.getYTranslation() < ambientState.getTopPadding()
+ ambientState.getStackTranslation()) { + ambientState.getStackTranslation()) {
// Handles HUN shadow when Shade is opened, and AmbientState.mScrollY > 0
// Calculate the HUN's z-value based on its overlapping fraction with QQS Panel.
// When scrolling down shade to make HUN back to in-position in Notification Panel,
// The over-lapping fraction goes to 0, and shadows hides gradually.
if (childrenOnTop != 0.0f) { if (childrenOnTop != 0.0f) {
// To elevate the later HUN over previous HUN // To elevate the later HUN over previous HUN when multiple HUNs exist
childrenOnTop++; childrenOnTop++;
} else { } else {
// Handles HUN shadow when Shade is opened, and AmbientState.mScrollY > 0
// Calculate the HUN's z-value based on its overlapping fraction with QQS Panel.
// When scrolling down shade to make HUN back to in-position in Notification Panel,
// The overlapping fraction goes to 0, and shadows hides gradually.
float overlap = ambientState.getTopPadding() float overlap = ambientState.getTopPadding()
+ ambientState.getStackTranslation() - childViewState.getYTranslation(); + ambientState.getStackTranslation() - childViewState.getYTranslation();
// To prevent over-shadow during HUN entry // To prevent over-shadow during HUN entry
@@ -915,7 +914,6 @@ public class StackScrollAlgorithm {
1.0f, 1.0f,
overlap / childViewState.height overlap / childViewState.height
); );
MathUtils.saturate(childrenOnTop);
} }
childViewState.setZTranslation(baseZ childViewState.setZTranslation(baseZ
+ childrenOnTop * mPinnedZTranslationExtra); + childrenOnTop * mPinnedZTranslationExtra);
@@ -945,7 +943,6 @@ public class StackScrollAlgorithm {
childViewState.setZTranslation(baseZ); childViewState.setZTranslation(baseZ);
} }
// Handles HUN shadow when shade is closed.
// While HUN is showing and Shade is closed: headerVisibleAmount stays 0, shadow stays. // While HUN is showing and Shade is closed: headerVisibleAmount stays 0, shadow stays.
// During HUN-to-Shade (eg. dragging down HUN to open Shade): headerVisibleAmount goes // During HUN-to-Shade (eg. dragging down HUN to open Shade): headerVisibleAmount goes
// gradually from 0 to 1, shadow hides gradually. // gradually from 0 to 1, shadow hides gradually.