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

Merge "Update JNI to match new MotionEvent initialize"

Browse Source
This commit is contained in:
Chavi Weingarten
2020-07-27 23:37:23 +00:00
committed by Android (Google) Code Review
parent 8d6853774e 59fd3a9c50
commit 607da72e55
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_view_InputEventSender.cpp
View File

@@ -144,9 +144,8 @@ status_t NativeInputEventSender::sendMotionEvent(uint32_t seq, const MotionEvent
event->getAction(), event->getActionButton(),
event->getFlags(), event->getEdgeFlags(),
event->getMetaState(), event->getButtonState(),
event->getClassification(), event->getXScale(),
event->getYScale(), event->getXOffset(),
event->getYOffset(), event->getXPrecision(),
event->getClassification(),
event->getTransform(), event->getXPrecision(),
event->getYPrecision(),
event->getRawXCursorPosition(),
event->getRawYCursorPosition(),

17
core/jni/android_view_MotionEvent.cpp
View File

@@ -369,13 +369,14 @@ static jlong android_view_MotionEvent_nativeInitialize(
env->DeleteLocalRef(pointerCoordsObj);
}
ui::Transform transform;
transform.set(xOffset, yOffset);
event->initialize(InputEvent::nextId(), deviceId, source, displayId, INVALID_HMAC, action, 0,
flags, edgeFlags, metaState, buttonState,
static_cast<MotionClassification>(classification), 1 /*xScale*/, 1 /*yScale*/,
xOffset, yOffset, xPrecision, yPrecision,
AMOTION_EVENT_INVALID_CURSOR_POSITION, AMOTION_EVENT_INVALID_CURSOR_POSITION,
downTimeNanos, eventTimeNanos, pointerCount, pointerProperties,
rawPointerCoords);
static_cast<MotionClassification>(classification), transform, xPrecision,
yPrecision, AMOTION_EVENT_INVALID_CURSOR_POSITION,
AMOTION_EVENT_INVALID_CURSOR_POSITION, downTimeNanos, eventTimeNanos,
pointerCount, pointerProperties, rawPointerCoords);
return reinterpret_cast<jlong>(event.release());
}
@@ -569,9 +570,9 @@ static void android_view_MotionEvent_nativeTransform(JNIEnv* env, jclass clazz,
jlong nativePtr, jobject matrixObj) {
MotionEvent* event = reinterpret_cast<MotionEvent*>(nativePtr);
float m[9];
AMatrix_getContents(env, matrixObj, m);
event->transform(m);
std::array<float, 9> matrix;
AMatrix_getContents(env, matrixObj, matrix.data());
event->transform(matrix);
}
// ----------------- @CriticalNative ------------------------------