- Version 5.1.0

dtmilano · dtmilano · commit 5f632398e26c · 2014-03-13T11:31:00.000-04:00
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.0.0',
+    version='5.1.0',
     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.0.0'
+__version__ = '5.1.0'
 
 import sys
 import warnings
@@ -391,7 +391,8 @@ def type(self, text):
         self.shell(u'input text "%s"' % text)
 
     def wake(self):
-        self.shell('input keyevent POWER')
+        if not self.isScreenOn():
+            self.shell('input keyevent POWER')
 
     def isLocked(self):
         '''
@@ -406,6 +407,19 @@ def isLocked(self):
             return (m.group(1) == 'true')
         raise RuntimeError("Couldn't determine screen lock state")
 
+    def isScreenOn(self):
+        '''
+        Checks if the screen is ON.
+
+        @return True if the device screen is ON
+        '''
+
+        screenOnRE = re.compile('mScreenOnFully=(true|false)')
+        m = screenOnRE.search(self.shell('dumpsys window policy'))
+        if m:
+            return (m.group(1) == 'true')
+        raise RuntimeError("Couldn't determine screen ON state")
+        
     def unlock(self):
         '''
         Unlocks the screen of the device.
