Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b46d

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

Change-Id: I76e72cb7b6b48e6746168ea7b217b98083220abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-19 19:28:59 +00:00
committed by Automerger Merge Worker

View File

@@ -157,7 +157,7 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
@Override @Override
public boolean pointInView(float localX, float localY, float slop) { public boolean pointInView(float localX, float localY, float slop) {
float top = mClipTopAmount; float top = Math.max(0, mClipTopAmount);
float bottom = mActualHeight; float bottom = mActualHeight;
return localX >= -slop && localY >= top - slop && localX < ((mRight - mLeft) + slop) && return localX >= -slop && localY >= top - slop && localX < ((mRight - mLeft) + slop) &&
localY < (bottom + slop); localY < (bottom + slop);