Merge pull request dtmilano#176 from steve-the-edwards/master

dtmilano · dtmilano · commit deb39157b314 · 2016-02-11T00:45:28.000-05:00
AVC: Try clicking as UiObject w/ UIAH, then fallback to coords
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -928,8 +928,16 @@ def touch(self, eventType=adbclient.DOWN_AND_UP, deltaX=0, deltaY=0):
             self.device.touch(x+10, y+10, eventType=adbclient.UP)
         else:
             if self.uiAutomatorHelper:
-                # FIXME: this could be also clicking the View by OID if findObject() were used to find the Views
-                self.uiAutomatorHelper.click(x=x, y=y)
+                try:
+                    oid = self.uiAutomatorHelper.findObject(self.getId())
+                    if DEBUG_UI_AUTOMATOR_HELPER:
+                        print >> sys.stderr, "oid=", oid
+                        print >> sys.stderr, "ignoring click delta to click View as UiObject"
+                    oid.click();
+                except RuntimeError as e:
+                    print >> sys.stderr, e.message
+                    print >> sys.stderr, "UiObject click failed, using co-ordinates"
+                    self.uiAutomatorHelper.click(x, y)
             else:
                 self.device.touch(x, y, eventType=eventType)
 
