workloads/speedometer: Misc Fixes

- Fix formatting
- Skip teardown automation if elements are not present on some devices
instead of failing the workload.
- Give extra time for start button to appear as some devices can be slow
to load.

2 files changed, 12 insertions, 10 deletions

diff --git a/wa/workloads/speedometer/com.arm.wa.uiauto.speedometer.apk b/wa/workloads/speedometer/com.arm.wa.uiauto.speedometer.apk
index 959f16ac..926ca759 100755
--- a/wa/workloads/speedometer/com.arm.wa.uiauto.speedometer.apk
+++ b/wa/workloads/speedometer/com.arm.wa.uiauto.speedometer.apk
diff --git a/wa/workloads/speedometer/uiauto/app/src/main/java/com/arm/wa/uiauto/speedometer/UiAutomation.java b/wa/workloads/speedometer/uiauto/app/src/main/java/com/arm/wa/uiauto/speedometer/UiAutomation.java
index 19f492b7..5b787caa 100755
--- a/wa/workloads/speedometer/uiauto/app/src/main/java/com/arm/wa/uiauto/speedometer/UiAutomation.java
+++ b/wa/workloads/speedometer/uiauto/app/src/main/java/com/arm/wa/uiauto/speedometer/UiAutomation.java
@@ -62,12 +62,12 @@ public class UiAutomation extends BaseUiAutomation {
     }
 
     public void clearFirstRun() throws Exception {
-        UiObject accept = 
+        UiObject accept =
             mDevice.findObject(new UiSelector().resourceId("com.android.chrome:id/terms_accept")
                 .className("android.widget.Button"));
         if (accept.exists()){
             accept.click();
-            UiObject negative = 
+            UiObject negative =
                 mDevice.findObject(new UiSelector().resourceId("com.android.chrome:id/negative_button")
                     .className("android.widget.Button"));
             negative.waitForExists(100000);
@@ -76,18 +76,18 @@ public class UiAutomation extends BaseUiAutomation {
     }
 
     public void runBenchmark() throws Exception {
-        UiObject start = 
+        UiObject start =
             mDevice.findObject(new UiSelector().description("Start Test")
                 .className("android.widget.Button"));
-            if (start.exists()){
+            if (start.waitForExists(2000)){
                 start.click();
             } else {
-            UiObject starttext = 
+            UiObject starttext =
                 mDevice.findObject(new UiSelector().text("Start Test")
                     .className("android.widget.Button"));
                 starttext.click();
             }
-        UiObject scores = 
+        UiObject scores =
             mDevice.findObject(new UiSelector().resourceId("result-number")
                 .className("android.view.View"));
         scores.waitForExists(2100000);
@@ -97,17 +97,19 @@ public class UiAutomation extends BaseUiAutomation {
     }
 
     public void clearTabs() throws Exception {
-        UiObject tabselector = 
+        UiObject tabselector =
             mDevice.findObject(new UiSelector().resourceId("com.android.chrome:id/tab_switcher_button")
                 .className("android.widget.ImageButton"));
+        if (!tabselector.exists()){
+            return;
+        }
         tabselector.click();
-        UiObject menu = 
+        UiObject menu =
             mDevice.findObject(new UiSelector().resourceId("com.android.chrome:id/menu_button")
                 .className("android.widget.ImageButton"));
         menu.click();
-        UiObject closetabs = 
+        UiObject closetabs =
             mDevice.findObject(new UiSelector().textContains("Close all tabs"));
         closetabs.click();
     }
 }
-