mirror of
https://github.com/ARM-software/workload-automation.git
synced 2025-03-22 10:38:37 +00:00
Merge pull request #318 from marcbonnici/googlephotos
GooglePhotos: Updated to work with the latest version (v2.6.0).
This commit is contained in:
commit
f8950dea33
Binary file not shown.
@ -102,6 +102,14 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
clickUiObject(BY_ID, packageID + "name", "android.widget.TextView");
|
clickUiObject(BY_ID, packageID + "name", "android.widget.TextView");
|
||||||
clickUiObject(BY_TEXT, "Use without an account", "android.widget.TextView", true);
|
clickUiObject(BY_TEXT, "Use without an account", "android.widget.TextView", true);
|
||||||
|
|
||||||
|
//Some devices get popup asking for confirmation to not use backup.
|
||||||
|
UiObject keepBackupOff =
|
||||||
|
new UiObject(new UiSelector().textContains("Keep Off")
|
||||||
|
.className("android.widget.Button"));
|
||||||
|
if (keepBackupOff.exists()){
|
||||||
|
keepBackupOff.click();
|
||||||
|
}
|
||||||
|
|
||||||
// On some devices the welcome views don't always appear so check
|
// On some devices the welcome views don't always appear so check
|
||||||
// for the existence of the wa-working directory before attempting
|
// for the existence of the wa-working directory before attempting
|
||||||
// to dismiss welcome views promoting app features
|
// to dismiss welcome views promoting app features
|
||||||
@ -162,15 +170,14 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
UiObject accept =
|
UiObject accept =
|
||||||
new UiObject(new UiSelector().description("Accept"));
|
new UiObject(new UiSelector().description("Accept"));
|
||||||
UiObject done =
|
UiObject done =
|
||||||
new UiObject(new UiSelector().resourceId(packageID + "cpe_save_button"));
|
new UiObject(new UiSelector().resourceId(packageID + "cpe_save_button")
|
||||||
|
.textContains("Done"));
|
||||||
|
|
||||||
// On some edit operations we can either confirm an edit with "Accept" or "DONE"
|
// On some edit operations we can either confirm an edit with "Accept", "DONE" or neither.
|
||||||
if (accept.waitForExists(timeout)) {
|
if (accept.waitForExists(timeout)) {
|
||||||
accept.click();
|
accept.click();
|
||||||
} else if (done.waitForExists(timeout)) {
|
} else if (done.waitForExists(timeout)) {
|
||||||
done.click();
|
done.click();
|
||||||
} else {
|
|
||||||
throw new UiObjectNotFoundException("Could not find \"Accept\" or \"DONE\" button.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dontsave) {
|
if (dontsave) {
|
||||||
@ -270,13 +277,24 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
if (editCol.waitForExists(timeout)) {
|
if (editCol.waitForExists(timeout)) {
|
||||||
editCol.click();
|
editCol.click();
|
||||||
} else {
|
} else {
|
||||||
throw new UiObjectNotFoundException(String.format("Could not find \"%s\" \"%s\"",
|
UiObject adjustTool =
|
||||||
"Color/Colour", "android.widget.RadioButton"));
|
new UiObject(new UiSelector().resourceId(packageID + "cpe_adjustments_tool")
|
||||||
|
.className("android.widget.ImageView"));
|
||||||
|
if (adjustTool.waitForExists(timeout)){
|
||||||
|
adjustTool.click();
|
||||||
|
} else {
|
||||||
|
throw new UiObjectNotFoundException(String.format("Could not find Color/Colour adjustment"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UiObject seekBar =
|
UiObject seekBar =
|
||||||
getUiObjectByResourceId(packageID + "cpe_strength_seek_bar",
|
new UiObject(new UiSelector().resourceId(packageID + "cpe_strength_seek_bar")
|
||||||
"android.widget.SeekBar");
|
.className("android.widget.SeekBar"));
|
||||||
|
if (!(seekBar.exists())){
|
||||||
|
seekBar =
|
||||||
|
new UiObject(new UiSelector().resourceIdMatches(".*/cpe_adjustments_section_slider")
|
||||||
|
.className("android.widget.SeekBar").descriptionMatches("Colou?r"));
|
||||||
|
}
|
||||||
|
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
Map.Entry<String, PositionPair> pair = it.next();
|
Map.Entry<String, PositionPair> pair = it.next();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user