Added new methods.

dtmilano · dtmilano · commit c2a9beef4dad · 2013-05-15T01:32:02.000-04:00
- Version 2.3.18
- Added ViewClient.sleep() &amp; ViewClient.isKeyboardDown()
- Added adb field
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -17,7 +17,7 @@
 @author: diego
 '''
 
-__version__ = '2.3.17'
+__version__ = '2.3.18'
 
 import sys
 import subprocess
@@ -957,6 +957,8 @@ def __init__(self, device, serialno, adb=None, autodump=True, forceviewserveruse
         else:
             adb = ViewClient.__obtainAdbPath()
 
+        self.adb = adb
+        ''' The adb command '''
         self.root = None
         ''' The root node '''
         self.viewsById = {}
@@ -1033,7 +1035,7 @@ def __init__(self, device, serialno, adb=None, autodump=True, forceviewserveruse
             self.localPort = localport
             self.remotePort = remoteport
             # FIXME: it seems there's no way of obtaining the serialno from the MonkeyDevice
-            subprocess.check_call([adb, '-s', self.serialno, 'forward', 'tcp:%d' % self.localPort,
+            subprocess.check_call([self.adb, '-s', self.serialno, 'forward', 'tcp:%d' % self.localPort,
                                     'tcp:%d' % self.remotePort])
 
         self.windows = None
@@ -1315,6 +1317,10 @@ def traverseShowClassIdTextPositionAndSize(view):
     TRAVERSE_CITPS = traverseShowClassIdTextPositionAndSize
     ''' An alias for L{traverseShowClassIdTextPositionAndSize(view)} '''
     
+    @staticmethod
+    def sleep(secs=1):
+        time.sleep(secs)
+    
     def assertServiceResponse(self, response):
         '''
         Checks whether the response received from the server is correct or raises and Exception.
@@ -1955,7 +1961,22 @@ def __getFocusedWindowPosition(self):
         return self.__getFocusedWindowId()
     
     def getSdkVersion(self):
+        '''
+        Gets the SDK version.
+        '''
+        
         return self.build[VERSION_SDK_PROPERTY]
+    
+    def isKeyboardShown(self):
+        '''
+        Whether the keyboard is displayed.
+        '''
+        
+        dim = self.device.shell('dumpsys input_method')
+        if dim:
+            # FIXME: API >= 15 ?
+            return "mInputShown=true" in dim
+        return False
 
 
 if __name__ == "__main__":
