Merge "Add QS header margin to OHM touch adjustment" into tm-qpr-dev am: 38d1b72cb2 am: cc690abbae

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

Change-Id: I9018b027576a456b7218326a1d72a72cd1e91995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2022-12-16 23:27:46 +00:00
committed by Automerger Merge Worker

View File

@@ -3707,7 +3707,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
* of DisplayArea into relative coordinates for all windows, we need to correct the
* QS Head bounds here.
*/
final int xOffset = Math.round(ev.getRawX() - ev.getX());
final int xOffset = Math.round(ev.getRawX() - ev.getX() + mQsHeader.getLeft());
final int yOffset = Math.round(ev.getRawY() - ev.getY());
mQsHeaderBound.offsetTo(xOffset, yOffset);
return mQsHeaderBound.contains((int) ev.getRawX(), (int) ev.getRawY());