adbclient: changed drag() duration parameter units

dtmilano · dtmilano · commit 27b1dc81e3e5 · 2014-03-13T12:54:51.000-04:00
- Version 5.1.1
diff --git a/AndroidViewClient/setup.py b/AndroidViewClient/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='5.1.0',
+    version='5.1.1',
     description='''AndroidViewClient is a 100% pure python tool that
         simplifies test script creation providing higher level operations and the ability of
         obtaining the tree of Views present at any given moment on the device or emulator screen.
diff --git a/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py b/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py
@@ -17,7 +17,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '5.1.0'
+__version__ = '5.1.1'
 
 import sys
 import warnings
@@ -378,14 +378,23 @@ def takeSnapshot(self, reconnect=False):
     def touch(self, x, y, eventType=DOWN_AND_UP):
         self.shell('input tap %d %d' % (x, y))
 
-    def drag(self, (x0, y0), (x1, y1), duration, steps):
+    def drag(self, (x0, y0), (x1, y1), duration, steps=1):
+        '''
+        Sends drag event (actually it's using C{input swipe} command.
+
+        @param (x0, y0): starting point
+        @param (x1, y1): ending point
+        @param duration: duration of the event in ms
+        @param steps: number of steps (currently ignored by @{input swipe}
+        '''
+
         version = int(self.getProperty('ro.build.version.sdk'))
         if version <= 15:
             raise RuntimeError('drag: API <= 15 not supported (version=%d)' % version)
         elif version <= 17:
             self.shell('input swipe %d %d %d %d' % (x0, y0, x1, y1))
         else:
-            self.shell('input swipe %d %d %d %d %d' % (x0, y0, x1, y1, duration * 1000))
+            self.shell('input swipe %d %d %d %d %d' % (x0, y0, x1, y1, duration))
 
     def type(self, text):
         self.shell(u'input text "%s"' % text)
