From c688cdba8e578d92685e33f30c5aa4aef73f59ca Mon Sep 17 00:00:00 2001
From: Justin Weir <justinweir@google.com>
Date: Wed, 14 Dec 2022 15:03:03 -0500
Subject: [PATCH] Add QS header margin to OHM touch adjustment

Test: manual and atest
Fixes: 238840692
Change-Id: I59c8905eabcca22e988caadf5f983ede74aac982
---
 .../notification/stack/NotificationStackScrollLayout.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d22bfe8b9e3ca..5db95d77d135d 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
@@ -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());