Merge "Better diags in ensureWorkspaceIsScrollable" into ub-launcher3-qt-dev

This commit is contained in:
Vadim Tryshev 2019-04-15 18:56:01 +00:00 committed by Android (Google) Code Review
commit d4eed0b191
1 changed files with 10 additions and 6 deletions

View File

@ -114,12 +114,16 @@ public final class Workspace extends Home {
public void ensureWorkspaceIsScrollable() {
final UiObject2 workspace = verifyActiveContainer();
if (!isWorkspaceScrollable(workspace)) {
dragIconToWorkspace(
mLauncher,
getHotseatAppIcon("Chrome"),
new Point(mLauncher.getDevice().getDisplayWidth(),
workspace.getVisibleBounds().centerY()), "deep_shortcuts_container");
verifyActiveContainer();
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"dragging icon to a second page of workspace to make it scrollable")) {
dragIconToWorkspace(
mLauncher,
getHotseatAppIcon("Chrome"),
new Point(mLauncher.getDevice().getDisplayWidth(),
workspace.getVisibleBounds().centerY()),
"deep_shortcuts_container");
verifyActiveContainer();
}
}
assertTrue("Home screen workspace didn't become scrollable",
isWorkspaceScrollable(workspace));