diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml index ea7a494225..fc06ba057f 100644 --- a/quickstep/res/layout/overview_clear_all_button.xml +++ b/quickstep/res/layout/overview_clear_all_button.xml @@ -17,6 +17,7 @@ assertEquals("Still have tasks after dismissing all", + 0, getTaskCount(launcher))); } private int getCurrentOverviewPage(Launcher launcher) { diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java index 5f601136d3..0ff307081c 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 androidx.annotation.NonNull; +import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.Direction; import androidx.test.uiautomator.UiObject2; @@ -28,6 +29,7 @@ import java.util.List; */ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { private static final int DEFAULT_FLING_SPEED = 15000; + private static final int FLINGS_FOR_DISMISS_LIMIT = 5; BaseOverview(LauncherInstrumentation launcher) { super(launcher); @@ -49,6 +51,22 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { verifyActiveContainer(); } + /** + * Dismissed all tasks by scrolling to Clear-all button and pressing it. + */ + public Workspace dismissAllTasks() { + final BySelector clearAllSelector = mLauncher.getLauncherObjectSelector("clear_all"); + for (int i = 0; + i < FLINGS_FOR_DISMISS_LIMIT + && verifyActiveContainer().findObject(clearAllSelector) == null; + ++i) { + flingForward(); + } + + mLauncher.getObjectInContainer(verifyActiveContainer(), clearAllSelector).click(); + return new Workspace(mLauncher); + } + /** * Flings backward (right) and waits the fling's end. */