wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 832635 - Scale the motion event replay to match the dimensions of the device the replay is happening on. r=jmaher a=android-only

Browse Source
This commit is contained in:
Kartikaya Gupta 2013-01-21 16:17:06 -05:00
parent 802e24ff19
commit b56bfc7137
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mobile/android/base/tests/MotionEventReplayer.java.in
View File

@ -23,16 +23,24 @@ import android.view.MotionEvent;
class MotionEventReplayer {
private static final String LOGTAG = "RobocopMotionEventReplayer";
// the inner dimensions of the window on which the motion event capture was taken from
private static final int CAPTURE_WINDOW_WIDTH = 720;
private static final int CAPTURE_WINDOW_HEIGHT = 1038;
private final Instrumentation mInstrumentation;
private final int mSurfaceOffsetX;
private final int mSurfaceOffsetY;
private final int mSurfaceWidth;
private final int mSurfaceHeight;
private final Map<String, Integer> mActionTypes;
private Method mObtainNanoMethod;
public MotionEventReplayer(Instrumentation inst, int surfaceOffsetX, int surfaceOffsetY) {
public MotionEventReplayer(Instrumentation inst, int surfaceOffsetX, int surfaceOffsetY, int surfaceWidth, int surfaceHeight) {
mInstrumentation = inst;
mSurfaceOffsetX = surfaceOffsetX;
mSurfaceOffsetY = surfaceOffsetY;
mSurfaceWidth = surfaceWidth;
mSurfaceHeight = surfaceHeight;
Log.i(LOGTAG, "Initialized using offset (" + mSurfaceOffsetX + "," + mSurfaceOffsetY + ")");
mActionTypes = new HashMap<String, Integer>();
@ -69,6 +77,14 @@ class MotionEventReplayer {
return Integer.parseInt(value);
}
private float scaleX(float value) {
return value * (float)mSurfaceWidth / (float)CAPTURE_WINDOW_WIDTH;
}
private float scaleY(float value) {
return value * (float)mSurfaceHeight / (float)CAPTURE_WINDOW_HEIGHT;
}
public void replayEvents(InputStream eventDescriptions)
throws IOException, IllegalAccessException, InvocationTargetException, NoSuchMethodException
{
@ -131,8 +147,8 @@ class MotionEventReplayer {
for (int i = 0; i < pointerCount; i++) {
pointerIds[i] = Integer.parseInt(eventProperties.get("id[" + i + "]"));
pointerCoords[i] = new MotionEvent.PointerCoords();
pointerCoords[i].x = mSurfaceOffsetX + Float.parseFloat(eventProperties.get("x[" + i + "]"));
pointerCoords[i].y = mSurfaceOffsetY + Float.parseFloat(eventProperties.get("y[" + i + "]"));
pointerCoords[i].x = mSurfaceOffsetX + scaleX(Float.parseFloat(eventProperties.get("x[" + i + "]")));
pointerCoords[i].y = mSurfaceOffsetY + scaleY(Float.parseFloat(eventProperties.get("y[" + i + "]")));
}
pointerData = pointerCoords;
} else {
@ -145,9 +161,9 @@ class MotionEventReplayer {
for (int i = 0; i < pointerCount; i++) {
pointerIds[i] = Integer.parseInt(eventProperties.get("id[" + i + "]"));
sampleData[(i * NUM_SAMPLE_DATA) + SAMPLE_X] =
mSurfaceOffsetX + Float.parseFloat(eventProperties.get("x[" + i + "]"));
mSurfaceOffsetX + scaleX(Float.parseFloat(eventProperties.get("x[" + i + "]")));
sampleData[(i * NUM_SAMPLE_DATA) + SAMPLE_Y] =
mSurfaceOffsetY + Float.parseFloat(eventProperties.get("y[" + i + "]"));
mSurfaceOffsetY + scaleY(Float.parseFloat(eventProperties.get("y[" + i + "]")));
}
pointerData = sampleData;
}

3
mobile/android/base/tests/testCheck2.java.in
View File

@ -30,7 +30,8 @@ public class testCheck2 extends PixelTest {
* overall performance, but doesn't really allow identifying which part is slow.
*/
MotionEventReplayer mer = new MotionEventReplayer(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop());
MotionEventReplayer mer = new MotionEventReplayer(getInstrumentation(), mDriver.getGeckoLeft(), mDriver.getGeckoTop(),
mDriver.getGeckoWidth(), mDriver.getGeckoHeight());
float completeness = 0.0f;
mDriver.startCheckerboardRecording();