Updated examples

Author: dtmilano

AndroidViewClient/examples/check-import.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env monkeyrunner
+#! /usr/bin/env python
 '''
 Created on Aug 29, 2012
 
@@ -45,5 +45,3 @@
 import com.dtmilano.android.viewclient
 from com.dtmilano.android.viewclient import ViewClient, View
 print "OK"
-
-from com.android.monkeyrunner import MonkeyRunner, MonkeyDevice

AndroidViewClient/examples/dump.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env monkeyrunner
+#! /usr/bin/env python
 
 print '''
 Notice:

AndroidViewClient/examples/temperature-converter-get-conversion.py

@@ -1,23 +1,26 @@
-#! /usr/bin/env monkeyrunner
+#! /usr/bin/env python
 '''
 Copyright (C) 2012  Diego Torres Milano
 Created on Feb 3, 2012
 
 This example starts the TemperatureConverter activity then type '123' into the 'Celsius' field.
 Then a ViewClient is created to obtain the view dump and the current values of the views with
-id/celsius and id/fahrenheith are obtained and the conversion printed to stdout.
+id/celsius and id/fahrenheit are obtained and the conversion printed to stdout.
 Finally, the fields are obtained by using their tags and again, conversion printed to stdout.
-  
+ 
+If --localViewServer is passed in the command line then LocalViewServer provided by
+TemperatureConverter is used. This is very useful when the device is secure and ViewServer
+cannot be started.
+
 @author: diego
 '''
 
 
 import re
 import sys
 import os
+import time
 
-# This must be imported before MonkeyRunner and MonkeyDevice,
-# otherwise the import fails.
 # PyDev sets PYTHONPATH, use it
 try:
     for p in os.environ['PYTHONPATH'].split(':'):
@@ -33,8 +36,6 @@
 
 from com.dtmilano.android.viewclient import ViewClient
 
-from com.android.monkeyrunner import MonkeyRunner, MonkeyDevice
-
 localViewServer = False
 if len(sys.argv) > 1 and sys.argv[1] == '--localViewServer':
     localViewServer = True
@@ -48,17 +49,22 @@
 componentName = package + "/" + activity
 
 device.startActivity(component=componentName, flags=FLAG_ACTIVITY_NEW_TASK)
-MonkeyRunner.sleep(5)
+time.sleep(5)
 
 
 device.type("123")
-MonkeyRunner.sleep(3)
+time.sleep(3)
 
 vc = ViewClient(device, serialno, startviewserver=(not localViewServer))
 
-# obtain the views by id
-celsius = vc.findViewByIdOrRaise("id/celsius")
-fahrenheit = vc.findViewByIdOrRaise("id/fahrenheit")
+if vc.build['ro.build.version.sdk'] >= 16:
+    # obtain the views by contentDescription
+    celsius = vc.findViewWithContentDescriptionOrRaise("celsius")
+    fahrenheit = vc.findViewWithContentDescriptionOrRaise("fahrenheit")
+else:
+    # obtain the views by id
+    celsius = vc.findViewByIdOrRaise("id/celsius")
+    fahrenheit = vc.findViewByIdOrRaise("id/fahrenheit")
 
 ct = celsius.getText()
 if ct: