summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff DeCew <jeffdq@google.com> 2022-06-06 13:35:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-06-06 13:35:57 +0000
commit2d3b1c27194d03986dac77d33d5a0ec14df3deb0 (patch)
tree86181826e36f50d132316c126a86908e7a5d0e8f
parentf88813c632af57d2b6aab66939588bbf4c989928 (diff)
parentaa72d09a5407f1d569628a5e5a0ae14777ab5bb6 (diff)
Merge "Fix yet another clipTopAmount usage" into tm-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index ba57d57d0fd3..270eb13c4224 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -1668,7 +1668,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
continue;
}
float childTop = slidingChild.getTranslationY();
- float top = childTop + slidingChild.getClipTopAmount();
+ float top = childTop + Math.max(0, slidingChild.getClipTopAmount());
float bottom = childTop + slidingChild.getActualHeight()
- slidingChild.getClipBottomAmount();