Merge "Re-land "Use SOURCE_CLASS_POINTER as the default source for MotionEvent"" into tm-dev (e2722fe9) · Commits · e / os / android_frameworks_base

core/java/android/view/MotionEvent.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1877,7 +1877,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_UNKNOWN,
		xPrecision, yPrecision, deviceId, edgeFlags, InputDevice.SOURCE_CLASS_POINTER,
		DEFAULT_DISPLAY);
		}

+24 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		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;
		@@ -214,4 +215,27 @@ 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());
		}
		}