summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Weir <justinweir@google.com> 2022-12-16 22:45:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-16 22:45:11 +0000
commitcc690abbae33ae0efe83924178e743feed7ea414 (patch)
tree5d50b743ec58d504fd6a3fca6d9295debb3f5139
parenta25e2ae7250acaad26756b1689943a8060c9ee32 (diff)
parent38d1b72cb2927d559123bba3b79666421a74cb3e (diff)
Merge "Add QS header margin to OHM touch adjustment" into tm-qpr-dev am: 38d1b72cb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20738702 Change-Id: I64b6420c6631e068c2edad4a36144b153672cc3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java2
1 files changed, 1 insertions, 1 deletions
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 d22bfe8b9e3c..5db95d77d135 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());