diff options
| author | Marc Bonnici <marc.bonnici@arm.com> | 2018-10-23 11:03:31 +0100 |
|---|---|---|
| committer | setrofim <setrofim@gmail.com> | 2018-10-24 10:34:44 +0100 |
| commit | 7632ee8288224384dc16e679ecab23f1e2bb1c45 (patch) | |
| tree | 2785462b55dff4ad1f5893c4ed6d1ba40d9a755f | |
| parent | 8f6b1a7fae0d6470163945f76de7be917c78fd57 (diff) | |
fw/uiauto: Add method to baseclass to dismiss android version popup
In Android Q a popup will be displayed warning if the application has
not been designed for the latest version of android. This has currently been
dealt with on a per workload basis however this is a common popup so
add a method to dismiss the popup if present to the base class.
| -rw-r--r-- | wa/framework/uiauto/app/src/main/java/com/arm/wa/uiauto/BaseUiAutomation.java | 15 | ||||
| -rw-r--r-- | wa/framework/uiauto/uiauto.aar | bin | 16896 -> 17105 bytes |
2 files changed, 15 insertions, 0 deletions
diff --git a/wa/framework/uiauto/app/src/main/java/com/arm/wa/uiauto/BaseUiAutomation.java b/wa/framework/uiauto/app/src/main/java/com/arm/wa/uiauto/BaseUiAutomation.java index a386a8e8..0a29df26 100644 --- a/wa/framework/uiauto/app/src/main/java/com/arm/wa/uiauto/BaseUiAutomation.java +++ b/wa/framework/uiauto/app/src/main/java/com/arm/wa/uiauto/BaseUiAutomation.java @@ -547,6 +547,21 @@ public class BaseUiAutomation { } } + // If an an app is not designed for running on the latest version of android + // (currently Q) dissmiss the warning popup if present. + public void dismissAndroidVersionPopup() throws Exception { + UiObject warningText = + mDevice.findObject(new UiSelector().textContains( + "This app was built for an older version of Android")); + UiObject acceptButton = + mDevice.findObject(new UiSelector().resourceId("android:id/button1") + .className("android.widget.Button")); + if (warningText.exists() && acceptButton.exists()) { + acceptButton.click(); + } + } + + // Override getParams function to decode a url encoded parameter bundle before // passing it to workloads. public Bundle getParams() { diff --git a/wa/framework/uiauto/uiauto.aar b/wa/framework/uiauto/uiauto.aar Binary files differindex 61584141..a39b662b 100644 --- a/wa/framework/uiauto/uiauto.aar +++ b/wa/framework/uiauto/uiauto.aar |