summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yining Liu <liuyining@google.com> 2023-02-14 18:28:11 +0000
committer Yining Liu <liuyining@google.com> 2023-02-14 19:27:08 +0000
commite42a900eff0a8eb609cb06652bac776f7e3f0f4d (patch)
tree0ec21b23b1f1e7cef48e42ae2494532edee7a84b
parent959110d32042e480474125f53a425981982ae308 (diff)
Correct comments in StackScrollAlgorithm
Correct the comments about HUNs' z-value. Bug: 266774171 Change-Id: Id94bcb21e7fd1e9fe8c2f0ece9d6d0e595054d2f Test: StackScrollAlgorithmTest
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java15
1 files changed, 6 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
index aff7b4c6c515..64bbd345fb74 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java
@@ -895,20 +895,19 @@ public class StackScrollAlgorithm {
ExpandableViewState childViewState = child.getViewState();
float baseZ = ambientState.getBaseZHeight();
- // Handles HUN shadow when Shade is opened
-
if (child.mustStayOnScreen() && !childViewState.headsUpIsVisible
&& !ambientState.isDozingAndNotPulsing(child)
&& childViewState.getYTranslation() < ambientState.getTopPadding()
+ 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) {
- // To elevate the later HUN over previous HUN
+ // To elevate the later HUN over previous HUN when multiple HUNs exist
childrenOnTop++;
} 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()
+ ambientState.getStackTranslation() - childViewState.getYTranslation();
// To prevent over-shadow during HUN entry
@@ -916,7 +915,6 @@ public class StackScrollAlgorithm {
1.0f,
overlap / childViewState.height
);
- MathUtils.saturate(childrenOnTop);
}
childViewState.setZTranslation(baseZ
+ childrenOnTop * mPinnedZTranslationExtra);
@@ -946,7 +944,6 @@ public class StackScrollAlgorithm {
childViewState.setZTranslation(baseZ);
}
- // Handles HUN shadow when shade is closed.
// 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
// gradually from 0 to 1, shadow hides gradually.