From 5e20670c0b3484b9d067edd0bf0b4e158165815c Mon Sep 17 00:00:00 2001
From: Xia Wang <xiaw@google.com>
Date: Fri, 18 May 2012 17:04:02 -0700
Subject: [PATCH] Remove the WaitEvent added in Tap and Drag.

As the delay is added as WaitEvent, throttle time is applied after
the WaitEvent. This cause problem for Tap and Drag. The thorrle time
is then inserted between ACTION_DOWN and ACTION_UP, or ACTION_DOWN
and ACTION_MOVE. This broke the two actions.

Change-Id: I5a122d6cb3d99e38d9442c3de50e0360652c4baf
---
 .../src/com/android/commands/monkey/MonkeySourceScript.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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