From 85ddfffd2f7414fbaf99f1750dcd89ed1aafddaa Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Wed, 31 Jan 2018 16:49:36 -0800 Subject: Move display id into MotionEvent Display id is now part of MotionEvent. Test: atest view.MotionEventTest view.KeyEventTest Bug: 64258305 Change-Id: Ifadd6b34f4dd5a91669baf146daa62944d1de974 --- core/java/android/view/InputEvent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/java/android/view/InputEvent.java') diff --git a/core/java/android/view/InputEvent.java b/core/java/android/view/InputEvent.java index e2ad3ad45c64..1f2aab94958c 100644 --- a/core/java/android/view/InputEvent.java +++ b/core/java/android/view/InputEvent.java @@ -51,7 +51,7 @@ public abstract class InputEvent implements Parcelable { * zero indicates that the event didn't come from a physical device * and maps to the default keymap. The other numbers are arbitrary and * you shouldn't depend on the values. - * + * * @return The device id. * @see InputDevice#getDevice */ @@ -59,7 +59,7 @@ public abstract class InputEvent implements Parcelable { /** * Gets the device that this event came from. - * + * * @return The device, or null if unknown. */ public final InputDevice getDevice() { @@ -68,7 +68,7 @@ public abstract class InputEvent implements Parcelable { /** * Gets the source of the event. - * + * * @return The event source or {@link InputDevice#SOURCE_UNKNOWN} if unknown. * @see InputDevice#getSources */ @@ -234,7 +234,7 @@ public abstract class InputEvent implements Parcelable { throw new IllegalStateException("Unexpected input event type token in parcel."); } } - + public InputEvent[] newArray(int size) { return new InputEvent[size]; } -- cgit v1.2.3