Uiautomator: Upgraded uiautomator base classes to Uiauto2

Uiautomator1 has been deprecated, therefore the uiautomation base classes have
been upgraded to use uiautomator2 and the new gradle build system.
Altered to retrieve `package_name` rather than `package` as per the previous commit.

wlauto/external/uiauto/app/build.gradle

@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 25
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support.test:runner:0.5'
+    compile 'com.android.support.test:rules:0.5'
+    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+}

wlauto/external/uiauto/app/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.arm.wlauto.uiauto">
+
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+</manifest>

wlauto/external/uiauto/app/src/main/java/com/arm/wlauto/uiauto/ApplaunchInterface.java

@@ -17,10 +17,10 @@
 package com.arm.wlauto.uiauto;
 
 import android.os.Bundle;
-import android.util.Log;
+import android.support.test.uiautomator.UiObject;
 
 // Import the uiautomator libraries
-import com.android.uiautomator.core.UiObject;
+
 
 /**
  * ApplaunchInterface.java
@@ -51,4 +51,8 @@ public interface ApplaunchInterface {
 
     /** Passes the workload parameters. */
     public void setWorkloadParameters(Bundle parameters);
-}
+
+    /** Initialize the instrumentation for the workload */
+    public void initialize_instrumentation();
+
+    }

wlauto/external/uiauto/app/src/main/java/com/arm/wlauto/uiauto/BaseUiAutomation.java

@@ -1,4 +1,4 @@
-/*    Copyright 2013-2015 ARM Limited
+/*    Copyright 2013-2016 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,36 +13,37 @@
  * limitations under the License.
 */
 
-
 package com.arm.wlauto.uiauto;
 
-import java.io.File;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiWatcher;
+import android.util.Log;
+
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.TimeUnit;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.SystemClock;
-import android.graphics.Point;
-import android.graphics.Rect;
-import android.util.Log;
+import static android.support.test.InstrumentationRegistry.getArguments;
 
-// Import the uiautomator libraries
-import com.android.uiautomator.core.UiObject;
-import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.android.uiautomator.core.UiScrollable;
-import com.android.uiautomator.core.UiSelector;
-import com.android.uiautomator.core.UiDevice;
-import com.android.uiautomator.core.UiWatcher;
-import com.android.uiautomator.testrunner.UiAutomatorTestCase;
-
-public class BaseUiAutomation extends UiAutomatorTestCase {
+public class BaseUiAutomation {
 
     public long uiAutoTimeout = TimeUnit.SECONDS.toMillis(4);
 
@@ -53,6 +54,18 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     public static final int CLICK_REPEAT_INTERVAL_MINIMUM = 5;
     public static final int CLICK_REPEAT_INTERVAL_DEFAULT = 50;
 
+    public Bundle parameters;
+
+    public Instrumentation mInstrumentation;
+    public Context mContext;
+    public UiDevice mDevice;
+
+    public void initialize_instrumentation(){
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mDevice = UiDevice.getInstance(mInstrumentation);
+        mContext = mInstrumentation.getTargetContext();
+    }
+
     /*
      * Used by clickUiObject() methods in order to provide a consistent API
      */
@@ -101,7 +114,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void sleep(int second) {
-        super.sleep(second * 1000);
+        SystemClock.sleep(second * 1000);
     }
 
     public boolean takeScreenshot(String name) {
@@ -109,7 +122,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
         String pngDir = params.getString("workdir");
 
         try {
-            return getUiDevice().takeScreenshot(new File(pngDir, name + ".png"));
+            return mDevice.takeScreenshot(new File(pngDir, name + ".png"));
         } catch (NoSuchMethodError e) {
             return true;
         }
@@ -121,8 +134,8 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
 
     public void waitText(String text, int second) throws UiObjectNotFoundException {
         UiSelector selector = new UiSelector();
-        UiObject textObj = new UiObject(selector.text(text)
-                                       .className("android.widget.TextView"));
+        UiObject textObj = mDevice.findObject(selector.text(text)
+                                              .className("android.widget.TextView"));
         waitObject(textObj, second);
     }
 
@@ -213,51 +226,51 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void registerWatcher(String name, UiWatcher watcher) {
-        UiDevice.getInstance().registerWatcher(name, watcher);
+        mDevice.registerWatcher(name, watcher);
     }
 
     public void runWatchers() {
-        UiDevice.getInstance().runWatchers();
+        mDevice.runWatchers();
     }
 
     public void removeWatcher(String name) {
-        UiDevice.getInstance().removeWatcher(name);
+        mDevice.removeWatcher(name);
     }
 
     public void pressEnter() {
-        UiDevice.getInstance().pressEnter();
+        mDevice.pressEnter();
     }
 
     public void pressHome() {
-        UiDevice.getInstance().pressHome();
+        mDevice.pressHome();
     }
 
     public void pressBack() {
-        UiDevice.getInstance().pressBack();
+        mDevice.pressBack();
     }
 
     public void pressDPadUp() {
-        UiDevice.getInstance().pressDPadUp();
+        mDevice.pressDPadUp();
     }
 
     public void pressDPadDown() {
-        UiDevice.getInstance().pressDPadDown();
+        mDevice.pressDPadDown();
     }
 
     public void pressDPadLeft() {
-        UiDevice.getInstance().pressDPadLeft();
+        mDevice.pressDPadLeft();
     }
 
     public void pressDPadRight() {
-        UiDevice.getInstance().pressDPadRight();
+        mDevice.pressDPadRight();
     }
 
     public int getDisplayHeight() {
-        return UiDevice.getInstance().getDisplayHeight();
+        return mDevice.getDisplayHeight();
     }
 
     public int getDisplayWidth() {
-        return UiDevice.getInstance().getDisplayWidth();
+        return mDevice.getDisplayWidth();
     }
 
     public int getDisplayCentreWidth() {
@@ -273,11 +286,11 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void tapDisplay(int x, int y) {
-        UiDevice.getInstance().click(x, y);
+        mDevice.click(x, y);
     }
 
     public void uiDeviceSwipeUp(int steps) {
-        UiDevice.getInstance().swipe(
+        mDevice.swipe(
             getDisplayCentreWidth(),
             (getDisplayCentreHeight() + (getDisplayCentreHeight() / 2)),
             getDisplayCentreWidth(),
@@ -286,7 +299,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void uiDeviceSwipeDown(int steps) {
-        UiDevice.getInstance().swipe(
+        mDevice.swipe(
             getDisplayCentreWidth(),
             (getDisplayCentreHeight() / 2),
             getDisplayCentreWidth(),
@@ -295,7 +308,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void uiDeviceSwipeLeft(int steps) {
-        UiDevice.getInstance().swipe(
+        mDevice.swipe(
             (getDisplayCentreWidth() + (getDisplayCentreWidth() / 2)),
             getDisplayCentreHeight(),
             (getDisplayCentreWidth() / 2),
@@ -304,7 +317,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void uiDeviceSwipeRight(int steps) {
-        UiDevice.getInstance().swipe(
+        mDevice.swipe(
             (getDisplayCentreWidth() / 2),
             getDisplayCentreHeight(),
             (getDisplayCentreWidth() + (getDisplayCentreWidth() / 2)),
@@ -409,13 +422,13 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     public void setScreenOrientation(ScreenOrientation orientation) throws Exception {
         switch (orientation) {
             case RIGHT:
-                getUiDevice().setOrientationRight();
+                mDevice.setOrientationRight();
                 break;
             case NATURAL:
-                getUiDevice().setOrientationNatural();
+                mDevice.setOrientationNatural();
                 break;
             case LEFT:
-                getUiDevice().setOrientationLeft();
+                mDevice.setOrientationLeft();
                 break;
             default:
                 throw new Exception("No orientation specified");
@@ -423,25 +436,25 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void unsetScreenOrientation() throws Exception {
-        getUiDevice().unfreezeRotation();
+        mDevice.unfreezeRotation();
     }
 
-   public void uiObjectPerformLongClick(UiObject view, int steps) throws Exception {
+    public void uiObjectPerformLongClick(UiObject view, int steps) throws Exception {
         Rect rect = view.getBounds();
-        UiDevice.getInstance().swipe(rect.centerX(), rect.centerY(),
-                                     rect.centerX(), rect.centerY(), steps);
+        mDevice.swipe(rect.centerX(), rect.centerY(),
+                rect.centerX(), rect.centerY(), steps);
     }
 
     public void uiDeviceSwipeVertical(int startY, int endY, int xCoordinate, int steps) {
-        getUiDevice().swipe(startY, xCoordinate, endY, xCoordinate, steps);
+        mDevice.swipe(startY, xCoordinate, endY, xCoordinate, steps);
     }
 
     public void uiDeviceSwipeHorizontal(int startX, int endX, int yCoordinate, int steps) {
-        getUiDevice().swipe(startX, yCoordinate, endX, yCoordinate, steps);
+        mDevice.swipe(startX, yCoordinate, endX, yCoordinate, steps);
     }
 
     public void uiObjectPinch(UiObject view, PinchType direction, int steps,
-                                  int percent) throws Exception {
+                              int percent) throws Exception {
         if (direction.equals(PinchType.IN)) {
             view.pinchIn(percent, steps);
         } else if (direction.equals(PinchType.OUT)) {
@@ -450,7 +463,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void uiObjectVertPinch(UiObject view, PinchType direction,
-                                       int steps, int percent) throws Exception {
+                                  int steps, int percent) throws Exception {
         if (direction.equals(PinchType.IN)) {
             uiObjectVertPinchIn(view, steps, percent);
         } else if (direction.equals(PinchType.OUT)) {
@@ -515,20 +528,20 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public UiObject getUiObjectByResourceId(String resourceId, String className, long timeout) throws Exception {
-        UiObject object = new UiObject(new UiSelector().resourceId(resourceId)
-                                                       .className(className));
+        UiObject object = mDevice.findObject(new UiSelector().resourceId(resourceId)
+                .className(className));
         if (!object.waitForExists(timeout)) {
-           throw new UiObjectNotFoundException(String.format("Could not find \"%s\" \"%s\"",
-                                                              resourceId, className));
+            throw new UiObjectNotFoundException(String.format("Could not find \"%s\" \"%s\"",
+                    resourceId, className));
         }
         return object;
     }
 
     public UiObject getUiObjectByResourceId(String id) throws Exception {
-        UiObject object = new UiObject(new UiSelector().resourceId(id));
+        UiObject object = mDevice.findObject(new UiSelector().resourceId(id));
 
         if (!object.waitForExists(uiAutoTimeout)) {
-           throw new UiObjectNotFoundException("Could not find view with resource ID: " + id);
+            throw new UiObjectNotFoundException("Could not find view with resource ID: " + id);
         }
         return object;
     }
@@ -538,20 +551,20 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public UiObject getUiObjectByDescription(String description, String className, long timeout) throws Exception {
-        UiObject object = new UiObject(new UiSelector().descriptionContains(description)
-                                                       .className(className));
+        UiObject object = mDevice.findObject(new UiSelector().descriptionContains(description)
+                                                             .className(className));
         if (!object.waitForExists(timeout)) {
             throw new UiObjectNotFoundException(String.format("Could not find \"%s\" \"%s\"",
-                                                              description, className));
+                    description, className));
         }
         return object;
     }
 
     public UiObject getUiObjectByDescription(String desc) throws Exception {
-        UiObject object = new UiObject(new UiSelector().descriptionContains(desc));
+        UiObject object = mDevice.findObject(new UiSelector().descriptionContains(desc));
 
         if (!object.waitForExists(uiAutoTimeout)) {
-           throw new UiObjectNotFoundException("Could not find view with description: " + desc);
+            throw new UiObjectNotFoundException("Could not find view with description: " + desc);
         }
         return object;
     }
@@ -561,8 +574,8 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public UiObject getUiObjectByText(String text, String className, long timeout) throws Exception {
-        UiObject object = new UiObject(new UiSelector().textContains(text)
-                                                       .className(className));
+        UiObject object = mDevice.findObject(new UiSelector().textContains(text)
+                                                             .className(className));
         if (!object.waitForExists(timeout)) {
             throw new UiObjectNotFoundException(String.format("Could not find \"%s\" \"%s\"",
                                                               text, className));
@@ -571,10 +584,10 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public UiObject getUiObjectByText(String text) throws Exception {
-        UiObject object = new UiObject(new UiSelector().textContains(text));
+        UiObject object = mDevice.findObject(new UiSelector().textContains(text));
 
         if (!object.waitForExists(uiAutoTimeout)) {
-           throw new UiObjectNotFoundException("Could not find view with text: " + text);
+            throw new UiObjectNotFoundException("Could not find view with text: " + text);
         }
         return object;
     }
@@ -582,10 +595,10 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     // Helper to select a folder in the gallery
     public void selectGalleryFolder(String directory) throws Exception {
         UiObject workdir =
-            new UiObject(new UiSelector().text(directory)
-                                         .className("android.widget.TextView"));
+                mDevice.findObject(new UiSelector().text(directory)
+                                                   .className("android.widget.TextView"));
         UiScrollable scrollView =
-            new UiScrollable(new UiSelector().scrollable(true));
+                new UiScrollable(new UiSelector().scrollable(true));
 
         // If the folder is not present wait for a short time for
         // the media server to refresh its index.
@@ -624,13 +637,13 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     // passing it to workloads.
     public Bundle getParams() {
         // Get the original parameter bundle
-        Bundle parameters = super.getParams();
+        parameters = getArguments();
 
-        // Decode each parameter in the bundle, except null values and "jars", as this
-        // is automatically added and therefore not encoded.
+        // Decode each parameter in the bundle, except null values and "class", as this
+        // used to control instrumentation and therefore not encoded.
         for (String key : parameters.keySet()) {
             String param = parameters.getString(key);
-            if (param != null && !key.equals("jars")) {
+            if (param != null && !key.equals("class")) {
                 param = android.net.Uri.decode(param);
                 parameters = decode(parameters, key, param);
             }
@@ -640,7 +653,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
 
     // Helper function to decode a string and insert it as an appropriate type
     // into a provided bundle with its key.
-    // Each bundle parameter will be a urlencoded string with 2 characters prefixed to the value 
+    // Each bundle parameter will be a urlencoded string with 2 characters prefixed to the value
     // used to store the original type information, e.g. 'fl' -> list of floats.
     private Bundle decode(Bundle parameters, String key, String value) {
         char value_type = value.charAt(0);
@@ -661,25 +674,25 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
             } else if (value_type == 'n') {
                 parameters.putString(key, "None");
             } else {
-            throw new IllegalArgumentException("Error decoding:" + key + value
-                                                + " - unknown format");
+                throw new IllegalArgumentException("Error decoding:" + key + value
+                                                   + " - unknown format");
             }
         } else if (value_dimension == 'l') {
             return decodeArray(parameters, key, value_type, param);
         } else {
             throw new IllegalArgumentException("Error decoding:" + key + value
-                                                + " - unknown format");
+                    + " - unknown format");
         }
         return parameters;
     }
 
     // Helper function to deal with decoding arrays and update the bundle with
-    // an appropriate array type. The string "0newelement0" is used to distinguish 
-    // each element for each other in the array when encoded. 
+    // an appropriate array type. The string "0newelement0" is used to distinguish
+    // each element for each other in the array when encoded.
     private Bundle decodeArray(Bundle parameters, String key, char type, String value) {
         String[] string_list = value.split("0newelement0");
         if (type == 's') {
-                parameters.putStringArray(key, string_list);
+            parameters.putStringArray(key, string_list);
         }
         else if (type == 'i') {
             int[] int_list = new int[string_list.length];
@@ -707,7 +720,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
             parameters.putBooleanArray(key, boolean_list);
         } else {
             throw new IllegalArgumentException("Error decoding array: " +
-                                                value + " - unknown format");
+                                               value + " - unknown format");
         }
         return parameters;
     }

wlauto/external/uiauto/app/src/main/java/com/arm/wlauto/uiauto/UiAutoUtils.java

@@ -16,20 +16,19 @@
 package com.arm.wlauto.uiauto;
 
 import android.os.Bundle;
-import java.util.logging.Logger;
 
 public final class UiAutoUtils {
-    
+
     /** Construct launch command of an application. */
     public static String createLaunchCommand(Bundle parameters) {
         String launchCommand;
         String activityName = parameters.getString("launch_activity");
-        String packageName = parameters.getString("package");
+        String packageName = parameters.getString("package_name");
         if (activityName.equals("None")) {
-            launchCommand = String.format("am start %s", packageName);
-        } 
+            launchCommand = String.format("am start --user -3 %s", packageName);
+        }
         else {
-            launchCommand = String.format("am start -n %s/%s", packageName, activityName);
+            launchCommand = String.format("am start --user -3 -n %s/%s", packageName, activityName);
         }
         return launchCommand;
     }

wlauto/external/uiauto/app/src/main/java/com/arm/wlauto/uiauto/UxPerfUiAutomation.java

@@ -15,18 +15,19 @@
 
 package com.arm.wlauto.uiauto;
 
-import java.util.logging.Logger;
 import android.os.Bundle;
 
+import java.util.logging.Logger;
+
 public class UxPerfUiAutomation extends BaseUiAutomation {
-    
+
     protected Bundle parameters;
     protected String packageName;
     protected String packageID;
 
     //Get application package parameters and create package ID
     public void getPackageParameters() {
-        packageName = parameters.getString("package");
+        packageName = parameters.getString("package_name");
         packageID = packageName + ":id/";
     }
 

wlauto/external/uiauto/build.gradle

@@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.2'
+
+
+    // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

wlauto/external/uiauto/build.sh

@@ -14,14 +14,18 @@
 # limitations under the License.
 #
 
-
+# Ensure gradelw exists before starting
+if [[ ! -f gradlew ]]; then
+    echo 'gradlew file not found! Check that you are in the right directory.'
+    exit 9
+fi
 
 # Build and return appropriate exit code if failed
-ant build
+./gradlew clean :app:assembleDebug
 exit_code=$?
 if [ $exit_code -ne 0 ]; then
-    echo "ERROR: 'ant build' exited with code $exit_code"
+    echo "ERROR: 'gradle build' exited with code $exit_code"
     exit $exit_code
 fi
 
-cp bin/classes/com/arm/wlauto/uiauto/*.class ../../common/android
+cp app/build/outputs/aar/app-debug.aar ../../common/android/uiauto.aar

wlauto/external/uiauto/build.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.arm.wlauto.uiauto" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: VERSION_TAG -->
-    <import file="${sdk.dir}/tools/ant/uibuild.xml" />
-
-</project>

wlauto/external/uiauto/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed May 03 15:42:44 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

wlauto/external/uiauto/gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

wlauto/external/uiauto/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

wlauto/external/uiauto/project.properties

@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-18

wlauto/external/uiauto/settings.gradle

@@ -0,0 +1 @@
+include ':app'