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

Move display id into MotionEvent

Browse Source 
Display id is now part of MotionEvent.

Test: atest view.MotionEventTest view.KeyEventTest
Bug: 64258305

Change-Id: Ifadd6b34f4dd5a91669baf146daa62944d1de974
This commit is contained in:
Siarhei Vishniakou
2018-01-31 16:49:36 -08:00
parent f4a368200e
commit 85ddfffd2f
26 changed files with 258 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/InputEvent.java
View File

@@ -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];
}

7
core/java/android/view/InputEventReceiver.java
View File

@@ -111,10 +111,9 @@ public abstract class InputEventReceiver {
* to indicate whether the event was handled. No new input events will be received
* until {@link #finishInputEvent} is called.
*
* @param displayId The display id on which input event triggered.
* @param event The input event that was received.
*/
public void onInputEvent(InputEvent event, int displayId) {
public void onInputEvent(InputEvent event) {
finishInputEvent(event, false);
}
@@ -181,9 +180,9 @@ public abstract class InputEventReceiver {
// Called from native code.
@SuppressWarnings("unused")
private void dispatchInputEvent(int seq, InputEvent event, int displayId) {
private void dispatchInputEvent(int seq, InputEvent event) {
mSeqMap.put(event.getSequenceNumber(), seq);
onInputEvent(event, displayId);
onInputEvent(event);
}
// Called from native code.

4
core/java/android/view/KeyEvent.java
View File

@@ -1556,8 +1556,8 @@ public class KeyEvent extends InputEvent implements Parcelable {
* @hide
*/
public static KeyEvent obtain(long downTime, long eventTime, int action,
int code, int repeat, int metaState,
int deviceId, int scancode, int flags, int source, String characters) {
int code, int repeat, int metaState,
int deviceId, int scancode, int flags, int source, String characters) {
KeyEvent ev = obtain();
ev.mDownTime = downTime;
ev.mEventTime = eventTime;

82
core/java/android/view/MotionEvent.java
View File

@@ -16,11 +16,14 @@
package android.view;
import static android.view.Display.DEFAULT_DISPLAY;
import android.annotation.TestApi;
import android.graphics.Matrix;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
import android.util.Log;
import android.util.SparseArray;
import dalvik.annotation.optimization.CriticalNative;
@@ -172,6 +175,7 @@ import java.util.Objects;
* </p>
*/
public final class MotionEvent extends InputEvent implements Parcelable {
private static final String TAG = "MotionEvent";
private static final long NS_PER_MS = 1000000;
private static final String LABEL_PREFIX = "AXIS_";
@@ -1470,7 +1474,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
private MotionEvent mNext;
private static native long nativeInitialize(long nativePtr,
int deviceId, int source, int action, int flags, int edgeFlags,
int deviceId, int source, int displayId, int action, int flags, int edgeFlags,
int metaState, int buttonState,
float xOffset, float yOffset, float xPrecision, float yPrecision,
long downTimeNanos, long eventTimeNanos,
@@ -1514,7 +1518,11 @@ public final class MotionEvent extends InputEvent implements Parcelable {
@CriticalNative
private static native int nativeGetSource(long nativePtr);
@CriticalNative
private static native int nativeSetSource(long nativePtr, int source);
private static native void nativeSetSource(long nativePtr, int source);
@CriticalNative
private static native int nativeGetDisplayId(long nativePtr);
@CriticalNative
private static native void nativeSetDisplayId(long nativePtr, int displayId);
@CriticalNative
private static native int nativeGetAction(long nativePtr);
@CriticalNative
@@ -1623,22 +1631,67 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* @param edgeFlags A bitfield indicating which edges, if any, were touched by this
* MotionEvent.
* @param source The source of this event.
* @param displayId The display ID associated with this event.
* @param flags The motion event flags.
* @hide
*/
static public MotionEvent obtain(long downTime, long eventTime,
int action, int pointerCount, PointerProperties[] pointerProperties,
PointerCoords[] pointerCoords, int metaState, int buttonState,
float xPrecision, float yPrecision, int deviceId,
int edgeFlags, int source, int flags) {
int edgeFlags, int source, int displayId, int flags) {
MotionEvent ev = obtain();
ev.mNativePtr = nativeInitialize(ev.mNativePtr,
deviceId, source, action, flags, edgeFlags, metaState, buttonState,
deviceId, source, displayId, action, flags, edgeFlags, metaState, buttonState,
0, 0, xPrecision, yPrecision,
downTime * NS_PER_MS, eventTime * NS_PER_MS,
pointerCount, pointerProperties, pointerCoords);
if (ev.mNativePtr == 0) {
Log.e(TAG, "Could not initialize MotionEvent");
ev.recycle();
return null;
}
return ev;
}
/**
* Create a new MotionEvent, filling in all of the basic values that
* define the motion.
*
* @param downTime The time (in ms) when the user originally pressed down to start
* a stream of position events. This must be obtained from {@link SystemClock#uptimeMillis()}.
* @param eventTime The the time (in ms) when this specific event was generated. This
* must be obtained from {@link SystemClock#uptimeMillis()}.
* @param action The kind of action being performed, such as {@link #ACTION_DOWN}.
* @param pointerCount The number of pointers that will be in this event.
* @param pointerProperties An array of <em>pointerCount</em> values providing
* a {@link PointerProperties} property object for each pointer, which must
* include the pointer identifier.
* @param pointerCoords An array of <em>pointerCount</em> values providing
* a {@link PointerCoords} coordinate object for each pointer.
* @param metaState The state of any meta / modifier keys that were in effect when
* the event was generated.
* @param buttonState The state of buttons that are pressed.
* @param xPrecision The precision of the X coordinate being reported.
* @param yPrecision The precision of the Y coordinate being reported.
* @param deviceId The id for the device that this event came from. An id of
* zero indicates that the event didn't come from a physical device; other
* numbers are arbitrary and you shouldn't depend on the values.
* @param edgeFlags A bitfield indicating which edges, if any, were touched by this
* MotionEvent.
* @param source The source of this event.
* @param flags The motion event flags.
*/
public static MotionEvent obtain(long downTime, long eventTime,
int action, int pointerCount, PointerProperties[] pointerProperties,
PointerCoords[] pointerCoords, int metaState, int buttonState,
float xPrecision, float yPrecision, int deviceId,
int edgeFlags, int source, int flags) {
return obtain(downTime, eventTime, action, pointerCount, pointerProperties, pointerCoords,
metaState, buttonState, xPrecision, yPrecision, deviceId, edgeFlags, source,
DEFAULT_DISPLAY, flags);
}
/**
* Create a new MotionEvent, filling in all of the basic values that
* define the motion.
@@ -1733,7 +1786,8 @@ public final class MotionEvent extends InputEvent implements Parcelable {
pc[0].size = size;
ev.mNativePtr = nativeInitialize(ev.mNativePtr,
deviceId, InputDevice.SOURCE_UNKNOWN, action, 0, edgeFlags, metaState, 0,
deviceId, InputDevice.SOURCE_UNKNOWN, DEFAULT_DISPLAY,
action, 0, edgeFlags, metaState, 0,
0, 0, xPrecision, yPrecision,
downTime * NS_PER_MS, eventTime * NS_PER_MS,
1, pp, pc);
@@ -1888,6 +1942,16 @@ public final class MotionEvent extends InputEvent implements Parcelable {
nativeSetSource(mNativePtr, source);
}
/** @hide */
public int getDisplayId() {
return nativeGetDisplayId(mNativePtr);
}
/** @hide */
public void setDisplayId(int displayId) {
nativeSetDisplayId(mNativePtr, displayId);
}
/**
* Return the kind of action being performed.
* Consider using {@link #getActionMasked} and {@link #getActionIndex} to retrieve
@@ -3023,7 +3087,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
/**
* Adds all of the movement samples of the specified event to this one if
* it is compatible. To be compatible, the event must have the same device id,
* source, action, flags, pointer count, pointer properties.
* source, display id, action, flags, pointer count, pointer properties.
*
* Only applies to {@link #ACTION_MOVE} or {@link #ACTION_HOVER_MOVE} events.
*
@@ -3043,6 +3107,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
if (nativeGetDeviceId(mNativePtr) != nativeGetDeviceId(event.mNativePtr)
|| nativeGetSource(mNativePtr) != nativeGetSource(event.mNativePtr)
|| nativeGetDisplayId(mNativePtr) != nativeGetDisplayId(event.mNativePtr)
|| nativeGetFlags(mNativePtr) != nativeGetFlags(event.mNativePtr)) {
return false;
}
@@ -3128,6 +3193,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
}
ev.mNativePtr = nativeInitialize(ev.mNativePtr,
nativeGetDeviceId(mNativePtr), nativeGetSource(mNativePtr),
nativeGetDisplayId(mNativePtr),
nativeGetAction(mNativePtr), nativeGetFlags(mNativePtr),
nativeGetEdgeFlags(mNativePtr), nativeGetMetaState(mNativePtr),
nativeGetButtonState(mNativePtr),
@@ -3172,7 +3238,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
>> ACTION_POINTER_INDEX_SHIFT;
int newActionPointerIndex = -1;
int newPointerCount = 0;
int newIdBits = 0;
for (int i = 0; i < oldPointerCount; i++) {
nativeGetPointerProperties(mNativePtr, i, pp[newPointerCount]);
final int idBit = 1 << pp[newPointerCount].id;
@@ -3182,7 +3247,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
}
map[newPointerCount] = i;
newPointerCount += 1;
newIdBits |= idBit;
}
}
@@ -3221,6 +3285,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
if (h == 0) {
ev.mNativePtr = nativeInitialize(ev.mNativePtr,
nativeGetDeviceId(mNativePtr), nativeGetSource(mNativePtr),
nativeGetDisplayId(mNativePtr),
newAction, nativeGetFlags(mNativePtr),
nativeGetEdgeFlags(mNativePtr), nativeGetMetaState(mNativePtr),
nativeGetButtonState(mNativePtr),
@@ -3266,6 +3331,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
msg.append(", downTime=").append(getDownTime());
msg.append(", deviceId=").append(getDeviceId());
msg.append(", source=0x").append(Integer.toHexString(getSource()));
msg.append(", displayId=").append(getDisplayId());
}
msg.append(" }");
return msg.toString();

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

@@ -7098,7 +7098,7 @@ public final class ViewRootImpl implements ViewParent,
}
@Override
public void onInputEvent(InputEvent event, int displayId) {
public void onInputEvent(InputEvent event) {
enqueueInputEvent(event, this, 0, true);
}

11
core/java/android/view/WindowManagerPolicyConstants.java
View File

@@ -16,8 +16,6 @@
package android.view;
import static android.view.Display.DEFAULT_DISPLAY;
/**
* Constants for interfacing with WindowManagerService and WindowManagerPolicyInternal.
* @hide
@@ -75,15 +73,6 @@ public interface WindowManagerPolicyConstants {
* copy() must be made and the copy must be recycled.
**/
void onPointerEvent(MotionEvent motionEvent);
/**
* @see #onPointerEvent(MotionEvent)
**/
default void onPointerEvent(MotionEvent motionEvent, int displayId) {
if (displayId == DEFAULT_DISPLAY) {
onPointerEvent(motionEvent);
}
}
}
/** Screen turned off because of a device admin */