Merge "Adding more context to swipe-to-home diags" into sc-v2-dev

This commit is contained in:
Vadim Tryshev
2021-07-15 00:58:45 +00:00
committed by Android (Google) Code Review

View File

@@ -699,7 +699,8 @@ public final class LauncherInstrumentation {
* @return the Workspace object.
*/
public Workspace pressHome() {
try (LauncherInstrumentation.Closable e = eventsCheck()) {
try (LauncherInstrumentation.Closable e = eventsCheck();
LauncherInstrumentation.Closable c = addContextLayer("want to switch to home")) {
waitForLauncherInitialized();
// Click home, then wait for any accessibility event, then wait until accessibility
// events stop.
@@ -719,7 +720,7 @@ public final class LauncherInstrumentation {
displaySize.x / 2, 0,
ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME,
false, GestureScope.INSIDE_TO_OUTSIDE);
try (LauncherInstrumentation.Closable c = addContextLayer(
try (LauncherInstrumentation.Closable c1 = addContextLayer(
"Swiped up from context menu to home")) {
waitUntilLauncherObjectGone(CONTEXT_MENU_RES_ID);
// Swiping up can temporarily bring Nexus Launcher if the current
@@ -768,7 +769,7 @@ public final class LauncherInstrumentation {
|| hasLauncherObject(OVERVIEW_RES_ID)),
action);
}
try (LauncherInstrumentation.Closable c = addContextLayer(
try (LauncherInstrumentation.Closable c1 = addContextLayer(
"performed action to switch to Home - " + action)) {
return getWorkspace();
}