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

Merge "Fix clipTopAmount when read in 2 more critical places" into tm-dev am: 8d2aafe801

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

Change-Id: Ibcf02f5cac4c24d726cf1972f8b8dbb8385622c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff DeCew
2022-05-23 22:34:15 +00:00
committed by Automerger Merge Worker
parent fffebba3fa 8d2aafe801
commit f796907b87
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java
View File

@@ -422,7 +422,7 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
outRect.top += getTop() + getTranslationY(); outRect.top += getTop() + getTranslationY();
} }
outRect.bottom = outRect.top + getActualHeight(); outRect.bottom = outRect.top + getActualHeight();
outRect.top += getClipTopAmount(); outRect.top += Math.max(0, getClipTopAmount());
} }
public boolean isSummaryWithChildren() { public boolean isSummaryWithChildren() {

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
View File

@@ -855,7 +855,7 @@ public class NotificationChildrenContainer extends ViewGroup
for (int childIdx = 0; childIdx < count; childIdx++) { for (int childIdx = 0; childIdx < count; childIdx++) {
ExpandableNotificationRow slidingChild = mAttachedChildren.get(childIdx); ExpandableNotificationRow slidingChild = mAttachedChildren.get(childIdx);
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();
if (y >= top && y <= bottom) { if (y >= top && y <= bottom) {
return slidingChild; return slidingChild;