From 3ccd2488c53139368d4153cdcf925e0f90cdd158 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Mon, 20 Dec 2021 14:40:28 +0000 Subject: [PATCH] Revert "Use SOURCE_CLASS_POINTER as the default source for MotionEvent" This reverts commit b1d3e076af1d86cf72678cd15ec2ebc808805c9a. Reason for revert: Breaking CarUiRecyclerViewTest#testThumbDragToCenter tests Bug: 211051185 Bug: 211051850 Bug: 213425347 Change-Id: Ia8e5c2301ab389a4e9b436165157f8918d285649 --- core/java/android/view/MotionEvent.java | 2 +- .../src/android/view/MotionEventTest.java | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 8db62f6553eba..adb8b86493d50 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1872,7 +1872,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { float x, float y, float pressure, float size, int metaState, float xPrecision, float yPrecision, int deviceId, int edgeFlags) { return obtain(downTime, eventTime, action, x, y, pressure, size, metaState, - xPrecision, yPrecision, deviceId, edgeFlags, InputDevice.SOURCE_CLASS_POINTER, + xPrecision, yPrecision, deviceId, edgeFlags, InputDevice.SOURCE_UNKNOWN, DEFAULT_DISPLAY); } diff --git a/core/tests/coretests/src/android/view/MotionEventTest.java b/core/tests/coretests/src/android/view/MotionEventTest.java index c4c983d24af92..78a8f7b3f32e5 100644 --- a/core/tests/coretests/src/android/view/MotionEventTest.java +++ b/core/tests/coretests/src/android/view/MotionEventTest.java @@ -16,7 +16,6 @@ package android.view; -import static android.view.InputDevice.SOURCE_CLASS_POINTER; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_POINTER_DOWN; import static android.view.MotionEvent.TOOL_TYPE_FINGER; @@ -215,27 +214,4 @@ public class MotionEventTest { rotInvalid.transform(mat); assertEquals(-1, rotInvalid.getSurfaceRotation()); } - - @Test - public void testUsesPointerSourceByDefault() { - final MotionEvent event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */, - ACTION_DOWN, 0 /* x */, 0 /* y */, 0 /* metaState */); - assertTrue(event.isFromSource(SOURCE_CLASS_POINTER)); - } - - @Test - public void testLocationOffsetOnlyAppliedToNonPointerSources() { - final MotionEvent event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */, - ACTION_DOWN, 10 /* x */, 20 /* y */, 0 /* metaState */); - event.offsetLocation(40, 50); - - // The offset should be applied since a pointer source is used by default. - assertEquals(50, (int) event.getX()); - assertEquals(70, (int) event.getY()); - - // The offset should not be applied if the source is changed to a non-pointer source. - event.setSource(InputDevice.SOURCE_JOYSTICK); - assertEquals(10, (int) event.getX()); - assertEquals(20, (int) event.getY()); - } }