Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synthesize remove events on PointerChange.ACTION_UP and PointerChange.ACTION_POINTER_UP #55157

Merged
merged 23 commits into from
Sep 14, 2024
Merged

Synthesize remove events on PointerChange.ACTION_UP and PointerChange.ACTION_POINTER_UP #55157

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
afb817b
log
Sep 11, 2024
6d45475
wip
Sep 11, 2024
15d315a
wip to undo
Sep 12, 2024
418fb9a
synthesize remove events
Sep 12, 2024
4c151d1
format
Sep 12, 2024
df7f327
undo logs, experimental changes
Sep 12, 2024
6542dde
undo other log
Sep 12, 2024
8a126d6
reorder slightly, make pointer count always correct size
Sep 12, 2024
8d8f109
ok actually do what the previous commit said
Sep 12, 2024
b23bbe6
format
Sep 12, 2024
8323737
don't include the synthetic pointer event in the pointercount
Sep 12, 2024
035a7a1
add test
Sep 12, 2024
274111d
format
Sep 12, 2024
2970d17
change to only remove when stylus, stylus inverted, and touch - and t…
Sep 13, 2024
6ae1ad4
format
Sep 13, 2024
b67584f
remove packet assert for scroll wheel
Sep 13, 2024
f6b55fd
Merge branch 'main' into debug_mouseregion
gmackall Sep 13, 2024
1d12768
a stylus can hover too, actually - don't remove on action up
Sep 13, 2024
58315fd
format
Sep 13, 2024
8d1762e
comment
Sep 13, 2024
c74378f
comment 2
Sep 13, 2024
c67c116
better comment
Sep 14, 2024
be5f1ec
format
Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
format
  • Loading branch information
Gray Mackall committed Sep 12, 2024
commit 274111d21d3dff99f83718881b0bd6d1cf1b8207
45 changes: 26 additions & 19 deletions shell/platform/android/test/io/flutter/embedding/android/AndroidTouchProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,23 @@ private long readPointerDeviceKind(ByteBuffer buffer) {
}

private long readPointerDeviceKindForPointer(ByteBuffer buffer, int pointerIndex) {
return buffer.getLong(3 * AndroidTouchProcessor.BYTES_PER_FIELD +
(AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
return buffer.getLong(
3 * AndroidTouchProcessor.BYTES_PER_FIELD
+ (AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
}

private long readPointerSignalKind(ByteBuffer buffer) {
return readPointerSignalKindForPointer(buffer, 0);
}

private long readPointerSignalKindForPointer(ByteBuffer buffer, int pointerIndex) {
return buffer.getLong(4 * AndroidTouchProcessor.BYTES_PER_FIELD +
(AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
return buffer.getLong(
4 * AndroidTouchProcessor.BYTES_PER_FIELD
+ (AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
}

private long readDevice(ByteBuffer buffer) {
Expand All @@ -96,21 +98,23 @@ private double readPointerPhysicalX(ByteBuffer buffer) {
}

private double readPointerPhysicalXForPointer(ByteBuffer buffer, int pointerIndex) {
return buffer.getDouble(7 * AndroidTouchProcessor.BYTES_PER_FIELD +
(AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
return buffer.getDouble(
7 * AndroidTouchProcessor.BYTES_PER_FIELD
+ (AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
}

private double readPointerPhysicalY(ByteBuffer buffer) {
return readPointerPhysicalYForPointer(buffer, 0);
}

private double readPointerPhysicalYForPointer(ByteBuffer buffer, int pointerIndex) {
return buffer.getDouble(8 * AndroidTouchProcessor.BYTES_PER_FIELD +
(AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
return buffer.getDouble(
8 * AndroidTouchProcessor.BYTES_PER_FIELD
+ (AndroidTouchProcessor.BYTES_PER_FIELD
* AndroidTouchProcessor.POINTER_DATA_FIELD_COUNT
* pointerIndex));
}

private long readButtons(ByteBuffer buffer) {
Expand Down Expand Up @@ -289,9 +293,12 @@ public void normalTouch() {
assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKind(packet));
assertEquals(10.0, readPointerPhysicalX(packet));
assertEquals(5.0, readPointerPhysicalY(packet));
assertEquals(AndroidTouchProcessor.PointerChange.REMOVE, readPointerChangeForPointer(packet, 1));
assertEquals(AndroidTouchProcessor.PointerDeviceKind.TOUCH, readPointerDeviceKindForPointer(packet, 1));
assertEquals(AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKindForPointer(packet, 1));
assertEquals(
AndroidTouchProcessor.PointerChange.REMOVE, readPointerChangeForPointer(packet, 1));
assertEquals(
AndroidTouchProcessor.PointerDeviceKind.TOUCH, readPointerDeviceKindForPointer(packet, 1));
assertEquals(
AndroidTouchProcessor.PointerSignalKind.NONE, readPointerSignalKindForPointer(packet, 1));
assertEquals(10.0, readPointerPhysicalXForPointer(packet, 1));
assertEquals(5.0, readPointerPhysicalYForPointer(packet, 1));
inOrder.verifyNoMoreInteractions();
Expand Down