aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chimpchat/src/com/android/chimpchat/adb/AdbChimpDevice.java3
-rw-r--r--chimpchat/src/com/android/chimpchat/core/TouchPressType.java2
-rw-r--r--monkeyrunner/src/com/android/monkeyrunner/MonkeyDevice.java3
3 files changed, 7 insertions, 1 deletions
diff --git a/chimpchat/src/com/android/chimpchat/adb/AdbChimpDevice.java b/chimpchat/src/com/android/chimpchat/adb/AdbChimpDevice.java
index 7c4b62a..200c69e 100644
--- a/chimpchat/src/com/android/chimpchat/adb/AdbChimpDevice.java
+++ b/chimpchat/src/com/android/chimpchat/adb/AdbChimpDevice.java
@@ -360,6 +360,9 @@ public class AdbChimpDevice implements IChimpDevice {
case DOWN_AND_UP:
manager.tap(x, y);
break;
+ case MOVE:
+ manager.touchMove(x, y);
+ break;
}
} catch (IOException e) {
LOG.log(Level.SEVERE, "Error sending touch event: " + x + " " + y + " " + type, e);
diff --git a/chimpchat/src/com/android/chimpchat/core/TouchPressType.java b/chimpchat/src/com/android/chimpchat/core/TouchPressType.java
index e5b92b7..7e1d4b6 100644
--- a/chimpchat/src/com/android/chimpchat/core/TouchPressType.java
+++ b/chimpchat/src/com/android/chimpchat/core/TouchPressType.java
@@ -23,7 +23,7 @@ import java.util.Map;
* When passed as a string, the "identifier" value is used.
*/
public enum TouchPressType {
- DOWN("down"), UP("up"), DOWN_AND_UP("downAndUp");
+ DOWN("down"), UP("up"), DOWN_AND_UP("downAndUp"), MOVE("move");
private static final Map<String,TouchPressType> identifierToEnum =
new HashMap<String,TouchPressType>();
diff --git a/monkeyrunner/src/com/android/monkeyrunner/MonkeyDevice.java b/monkeyrunner/src/com/android/monkeyrunner/MonkeyDevice.java
index e60d12e..41e58f9 100644
--- a/monkeyrunner/src/com/android/monkeyrunner/MonkeyDevice.java
+++ b/monkeyrunner/src/com/android/monkeyrunner/MonkeyDevice.java
@@ -66,6 +66,9 @@ public class MonkeyDevice extends PyObject implements ClassDictInit {
@MonkeyRunnerExported(doc = "Sends a DOWN event, immediately followed by an UP event when used with touch() or press()")
public static final String DOWN_AND_UP = TouchPressType.DOWN_AND_UP.getIdentifier();
+ @MonkeyRunnerExported(doc = "Sends a MOVE event when used with touch().")
+ public static final String MOVE = TouchPressType.MOVE.getIdentifier();
+
private IChimpDevice impl;
public MonkeyDevice(IChimpDevice impl) {