- Fixed View.getXY()

dtmilano · dtmilano · commit c2d5b93445f4 · 2012-02-06T23:29:10.000-05:00
- Modified development-settings-show-running-processes
diff --git a/AndroidViewClient/examples/development-settings-show-running-processes.py b/AndroidViewClient/examples/development-settings-show-running-processes.py
@@ -22,30 +22,32 @@
 
 from com.android.monkeyrunner import MonkeyRunner, MonkeyDevice
 
-STATUS_BAR = 38
-TITLE = 40
-CHECK_BOX = 50
 
 # 01-04 18:23:42.000: I/ActivityManager(4288): Displayed com.android.development/.DevelopmentSettings: +379ms
 package = 'com.android.development'                                          
-activity = '.DevelopmentSetting'                           
+activity = '.DevelopmentSettings'                           
 componentName = package + "/" + activity                        
-device = MonkeyRunner.waitForConnection(60)
+device = MonkeyRunner.waitForConnection(60, "emulator-5554")
 if not device:
 	raise Exception('Cannot connect to device')
 
 device.startActivity(component=componentName)
+MonkeyRunner.sleep(5)
+
 vc = ViewClient(device)
 vc.dump()
-print vc.getViewIds().keys()
 
 showCpu = vc.findViewById("id/show_cpu")
 showLoad = vc.findViewById("id/show_load")
 alwaysFinish = vc.findViewById("id/always_finish")
 
-if showLoad.isChecked() == 'false':
+if not showLoad.isChecked():
     showLoad.touch()
 
-if alwaysFinish['isChecked()'] == 'false':
+if not alwaysFinish.isChecked():
     alwaysFinish.touch()
 
+if not showCpu.isChecked():
+    # WARNING: Show CPU usage is de-activated as soon as it's activated, that's why it seems it
+    # is never set
+    showCpu.touch()
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -10,7 +10,7 @@
 import socket
 import os
 
-DEBUG = True
+DEBUG = False
 
 ANDROID_HOME = os.environ['ANDROID_HOME'] if os.environ.has_key('ANDROID_HOME') else '/opt/android-sdk'
 VIEW_SERVER_HOST = 'localhost'
@@ -26,6 +26,10 @@ class View:
     '''
     
     def __init__(self, map, device):
+        '''
+        Constructor
+        '''
+        
         self.map = map
         self.device = device
         
@@ -34,7 +38,7 @@ def __getitem__(self, key):
         
     def __getattr__(self, name):
         if DEBUG:
-            print "__getattr__(%s)" % (name)
+            print >>sys.stderr, "__getattr__(%s)" % (name)
         
         # I should try to see if 'name' is a defined method
         # but it seems that if I call locals() here an infinite loop is entered
@@ -80,16 +84,24 @@ def __call__(self, *args, **kwargs):
             print "__call__(%s)" % (args if args else None)
             
     def getXY(self):
+        '''
+        Returns the coordinates of this View
+        '''
+        
         # FIXME: it's not always a CheckBox
-        x = int(map['layout:mLeft']) + int(map['layout:layout_leftMargin']) + CHECK_BOX/2
-        y = int(map['layout:mTop']) + int(map['layout:layout_topMargin']) + STATUS_BAR + TITLE + CHECK_BOX/2
+        x = int(self.map['layout:mLeft']) + int(self.map['layout:layout_leftMargin']) + CHECK_BOX/2
+        y = int(self.map['layout:mTop']) + int(self.map['layout:layout_topMargin']) + STATUS_BAR + TITLE + CHECK_BOX/2
         return (x, y)
 
     # FIXME: should be MonkeyDevice.DOWN_AND_UP
-    def touch(self, type="DOWN_AND_UP"): 
+    def touch(self, type="DOWN_AND_UP"):
+        '''
+        Touches this View
+        '''
+        
         (x, y) = self.getXY()
         if DEBUG:
-            print "should click @ (%d, %d)" % (x, y)
+            print >>sys.stderr, "should click @ (%d, %d)" % (x, y)
         self.device.touch(x, y, type)
         
     def allPossibleNamesWithColon(self, name):
