Merge "Ensure widgets header is out of the gesture region before clicking" into sc-dev
This commit is contained in:
commit
0877cdab7a
|
@ -185,8 +185,12 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
|
||||||
targetAppSelector);
|
targetAppSelector);
|
||||||
if (headerTitle != null) {
|
if (headerTitle != null) {
|
||||||
// If we find the header and it has not been expanded, let's click it to see the
|
// If we find the header and it has not been expanded, let's click it to see the
|
||||||
// widgets list.
|
// widgets list. Note that we wait until the header is out of the gesture region at
|
||||||
if (!hasHeaderExpanded) {
|
// the bottom of the screen, because tapping there in Launcher3 causes NexusLauncher
|
||||||
|
// to briefly appear to handle the gesture, which can break our test.
|
||||||
|
boolean isHeaderOutOfGestureRegion = headerTitle.getVisibleCenter().y
|
||||||
|
< mLauncher.getBottomGestureStartOnScreen();
|
||||||
|
if (!hasHeaderExpanded && isHeaderOutOfGestureRegion) {
|
||||||
log("Header has not been expanded. Click to expand.");
|
log("Header has not been expanded. Click to expand.");
|
||||||
hasHeaderExpanded = true;
|
hasHeaderExpanded = true;
|
||||||
mLauncher.clickLauncherObject(headerTitle);
|
mLauncher.clickLauncherObject(headerTitle);
|
||||||
|
|
Loading…
Reference in New Issue