From b4ff22754ac4edded4fbdb4b3351c4e7a9c9700b Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Sun, 31 Dec 2023 13:33:51 -0800 Subject: [PATCH] Waiting for the state to settle after clear-all-tasks action Bug: 313926097 Flag: N/A Test: presubmit Change-Id: Idbbf48d5814fa457b3542ff972bfb86d31f04377 --- .../android/quickstep/FallbackRecentsTest.java | 1 - .../com/android/launcher3/tapl/BaseOverview.java | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index edf95eaaf4..a8667b6115 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -280,7 +280,6 @@ public class FallbackRecentsTest { // Test dismissing all tasks. pressHomeAndGoToOverview().dismissAllTasks(); - waitForRecentsActivityStop(); // dismissAllTasks() will close Recents assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg( mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS)); } diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java index b6b4a47a1a..13187fd1a9 100644 --- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java @@ -17,6 +17,7 @@ package com.android.launcher3.tapl; import static com.android.launcher3.tapl.LauncherInstrumentation.TASKBAR_RES_ID; +import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL; import android.graphics.Rect; @@ -128,8 +129,19 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { flingForwardImpl(); } - mLauncher.clickLauncherObject( - mLauncher.waitForObjectInContainer(verifyActiveContainer(), clearAllSelector)); + final Runnable clickClearAll = () -> mLauncher.clickLauncherObject( + mLauncher.waitForObjectInContainer(verifyActiveContainer(), + clearAllSelector)); + if (mLauncher.is3PLauncher()) { + mLauncher.executeAndWaitForLauncherStop( + clickClearAll, + "clicking 'Clear All'"); + } else { + mLauncher.runToState( + clickClearAll, + NORMAL_STATE_ORDINAL, + "clicking 'Clear All'"); + } mLauncher.waitUntilLauncherObjectGone(clearAllSelector); }