Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed ActivityChooser logic for the initial case."

Browse Source
This commit is contained in:
Felipe Leme
2015-12-14 03:34:10 +00:00
committed by Android (Google) Code Review
parent f420eb1106 fb7b4a5bf1
commit 2d76c84cf4
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/Shell/tests/src/com/android/shell/UiBot.java
View File

@@ -124,6 +124,16 @@ final class UiBot {
if (gotIt) {
Log.v(TAG, "Found activity " + name + ", it's the default action");
// Clicks the "Just Once" button.
gotIt = mDevice
.wait(Until.hasObject(By.res("android", "button_once")), mTimeout);
assertTrue("'Just Once' button not visible yet", gotIt);
UiObject justOnce = mDevice
.findObject(new UiSelector().resourceId("android:id/button_once"));
assertTrue("'Just Once' button not found", justOnce.exists());
click(justOnce, "Just Once");
} else {
// Since it's not, need to find it in the scrollable list...
Log.v(TAG, "Activity " + name + " is not default action");
@@ -140,16 +150,5 @@ final class UiBot {
// ... then select it.
click(activity, name);
}
// Then clicks the "Just Once" button.
gotIt = mDevice
.wait(Until.hasObject(By.res("android", "button_once")), mTimeout);
assertTrue("'Just Once' button not visible yet", gotIt);
UiObject justOnce = mDevice
.findObject(new UiSelector().resourceId("android:id/button_once"));
assertTrue("'Just Once' button not found", justOnce.exists());
click(justOnce, "Just Once");
}
}