LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am d699ad18: Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev

Browse Source 
* commit 'd699ad187756b1138e6c697c285dd476c2d0c449':
  Remove the WaitEvent added in Tap and Drag.
This commit is contained in:
Xia Wang
2012-05-18 17:55:38 -07:00
committed by Android Git Automerger
parent 8eb23596b7 d699ad1877
commit 08eafbb0cf
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/monkey/src/com/android/commands/monkey/MonkeySourceScript.java
View File

@@ -328,7 +328,7 @@ public class MonkeySourceScript implements MonkeyEventSource {
try { try {
float x = Float.parseFloat(args[0]); float x = Float.parseFloat(args[0]);
float y = Float.parseFloat(args[1]); float y = Float.parseFloat(args[1]);
long tapDuration = 5; long tapDuration = 0;
if (args.length == 3) { if (args.length == 3) {
tapDuration = Long.parseLong(args[2]); tapDuration = Long.parseLong(args[2]);
} }
@@ -396,7 +396,6 @@ public class MonkeySourceScript implements MonkeyEventSource {
long downTime = SystemClock.uptimeMillis(); long downTime = SystemClock.uptimeMillis();
long eventTime = SystemClock.uptimeMillis(); long eventTime = SystemClock.uptimeMillis();
MonkeyWaitEvent wayPointDelay = new MonkeyWaitEvent(5);
if (stepCount > 0) { if (stepCount > 0) {
float xStep = (xEnd - xStart) / stepCount; float xStep = (xEnd - xStart) / stepCount;
float yStep = (yEnd - yStart) / stepCount; float yStep = (yEnd - yStart) / stepCount;
@@ -407,7 +406,6 @@ public class MonkeySourceScript implements MonkeyEventSource {
mQ.addLast(e); mQ.addLast(e);
for (int i = 0; i < stepCount; ++i) { for (int i = 0; i < stepCount; ++i) {
mQ.addLast(wayPointDelay);
x += xStep; x += xStep;
y += yStep; y += yStep;
eventTime = SystemClock.uptimeMillis(); eventTime = SystemClock.uptimeMillis();
@@ -416,7 +414,6 @@ public class MonkeySourceScript implements MonkeyEventSource {
mQ.addLast(e); mQ.addLast(e);
} }
mQ.addLast(wayPointDelay);
eventTime = SystemClock.uptimeMillis(); eventTime = SystemClock.uptimeMillis();
e = new MonkeyTouchEvent(MotionEvent.ACTION_UP).setDownTime(downTime) e = new MonkeyTouchEvent(MotionEvent.ACTION_UP).setDownTime(downTime)
.setEventTime(eventTime).addPointer(0, x, y, 1, 5); .setEventTime(eventTime).addPointer(0, x, y, 1, 5);