Merge "Revert "Fix attempt for TaplTwoPanelWorkspaceTest#testSinglePageDragIconWhenMultiplePageScrollingIsPossible"" into main

This commit is contained in:
Federico Baron
2024-07-09 16:47:18 +00:00
committed by Android (Google) Code Review
@@ -352,11 +352,8 @@ public class TaplTwoPanelWorkspaceTest extends AbstractLauncherUiTest<Launcher>
}
private void assertPagesExist(Launcher launcher, int... pageIds) {
waitForLauncherCondition("Existing page count does NOT match. "
+ "Expected: " + pageIds.length
+ ". Actual: " + launcher.getWorkspace().getPageCount(),
l -> pageIds.length == l.getWorkspace().getPageCount());
int pageCount = launcher.getWorkspace().getPageCount();
assertEquals("Existing page count does NOT match.", pageIds.length, pageCount);
for (int i = 0; i < pageCount; i++) {
CellLayout page = (CellLayout) launcher.getWorkspace().getPageAt(i);
int pageId = launcher.getWorkspace().getCellLayoutId(page);