getRestrictedScreen support android-2.3.5 version

codeskyblue · codeskyblue · commit 1d04fa2e860f · 2014-08-04T13:00:31.000+08: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='7.1.1',
+    version='7.1.2',
     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
@@ -285,11 +285,18 @@ def shell(self, cmd=None):
     def getRestrictedScreen(self):
         ''' Gets C{mRestrictedScreen} values from dumpsys. This is a method to obtain display dimensions '''
 
+        outlines = self.shell('dumpsys window').splitlines()
         rsRE = re.compile('\s*mRestrictedScreen=\((?P<x>\d+),(?P<y>\d+)\) (?P<w>\d+)x(?P<h>\d+)')
-        for line in self.shell('dumpsys window').splitlines():
+        for line in outlines:
             m = rsRE.match(line)
             if m:
                 return m.groups()
+        # in order to competiable with android-2.3.5
+        dsRE = re.compile('\s*DisplayWidth=(?P<x>\d+) DisplayHeight=(?P<y>\d+)')
+        for line in outlines:
+            m = dsRE.match(line)
+            if m:
+                return ('0', '0') + m.groups()
         raise RuntimeError("Couldn't find mRestrictedScreen in dumpsys")
 
     def __getProp(self, key, strip=True):
