Merge "Fix yet another clipTopAmount usage" into tm-dev am: 2d3b1c2719 am: 9e43e56e57

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

Change-Id: Id9afbe7b08ac47e0aaad95536e10060669014f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff DeCew
2022-06-06 14:12:29 +00:00
committed by Automerger Merge Worker

View File

@@ -1668,7 +1668,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
continue; continue;
} }
float childTop = slidingChild.getTranslationY(); float childTop = slidingChild.getTranslationY();
float top = childTop + slidingChild.getClipTopAmount(); float top = childTop + Math.max(0, slidingChild.getClipTopAmount());
float bottom = childTop + slidingChild.getActualHeight() float bottom = childTop + slidingChild.getActualHeight()
- slidingChild.getClipBottomAmount(); - slidingChild.getClipBottomAmount();