Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ViewGroup: Fix dispatching of generic motion events" into udc-qpr-dev

Browse Source
This commit is contained in:
Prabir Pradhan
2023-08-01 17:46:23 +00:00
committed by Android (Google) Code Review
parent 5d3461460a a7adeb7c86
commit 1b2f70519b
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewGroup.java
View File

@@ -2539,7 +2539,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
final int childrenCount = mChildrenCount;
if (childrenCount != 0) {
final float x = event.getXDispatchLocation(0);
final float y = event.getXDispatchLocation(0);
final float y = event.getYDispatchLocation(0);
final ArrayList<View> preorderedList = buildOrderedChildList();
final boolean customOrder = preorderedList == null

19
core/tests/coretests/src/android/view/ViewGroupTest.java
View File

@@ -49,11 +49,11 @@ public class ViewGroupTest {
public void testDispatchMouseEventsUnderCursor() {
final Context context = getInstrumentation().getContext();
final TestView viewGroup = new TestView(context, 0 /* left */, 0 /* top */,
200 /* right */, 200 /* bottom */);
200 /* right */, 100 /* bottom */);
final TestView viewA = spy(new TestView(context, 0 /* left */, 0 /* top */,
100 /* right */, 200 /* bottom */));
100 /* right */, 100 /* bottom */));
final TestView viewB = spy(new TestView(context, 100 /* left */, 0 /* top */,
200 /* right */, 200 /* bottom */));
200 /* right */, 100 /* bottom */));
viewGroup.addView(viewA);
viewGroup.addView(viewB);
@@ -73,10 +73,10 @@ public class ViewGroupTest {
MotionEvent.PointerCoords[] coords = new MotionEvent.PointerCoords[2];
coords[0] = new MotionEvent.PointerCoords();
coords[0].x = 80;
coords[0].y = 100;
coords[0].y = 50;
coords[1] = new MotionEvent.PointerCoords();
coords[1].x = 240;
coords[1].y = 100;
coords[1].y = 50;
MotionEvent event;
// Make sure the down event is active with a pointer which coordinate is different from the
@@ -91,6 +91,10 @@ public class ViewGroupTest {
viewGroup.onResolvePointerIcon(event, 0 /* pointerIndex */);
verify(viewB).onResolvePointerIcon(event, 0);
event.setAction(MotionEvent.ACTION_SCROLL);
viewGroup.dispatchGenericMotionEvent(event);
verify(viewB).dispatchGenericMotionEvent(event);
event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */,
MotionEvent.ACTION_POINTER_DOWN | (1 << MotionEvent.ACTION_POINTER_INDEX_SHIFT),
2 /* pointerCount */, properties, coords, 0 /* metaState */, 0 /* buttonState */,
@@ -102,8 +106,13 @@ public class ViewGroupTest {
viewGroup.onResolvePointerIcon(event, 1 /* pointerIndex */);
verify(viewB).onResolvePointerIcon(event, 1);
event.setAction(MotionEvent.ACTION_SCROLL);
viewGroup.dispatchGenericMotionEvent(event);
verify(viewB).dispatchGenericMotionEvent(event);
verify(viewA, never()).dispatchTouchEvent(any());
verify(viewA, never()).onResolvePointerIcon(any(), anyInt());
verify(viewA, never()).dispatchGenericMotionEvent(any());
}
/**