Merge "Add QS header margin to OHM touch adjustment" into tm-qpr-dev

This commit is contained in:
Justin Weir
2022-12-16 22:35:37 +00:00
committed by Android (Google) Code Review

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 * of DisplayArea into relative coordinates for all windows, we need to correct the
* QS Head bounds here. * 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()); final int yOffset = Math.round(ev.getRawY() - ev.getY());
mQsHeaderBound.offsetTo(xOffset, yOffset); mQsHeaderBound.offsetTo(xOffset, yOffset);
return mQsHeaderBound.contains((int) ev.getRawX(), (int) ev.getRawY()); return mQsHeaderBound.contains((int) ev.getRawX(), (int) ev.getRawY());