Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 501e4ab7 authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix attempt for ... 

Merge "Revert "Fix attempt for  TaplTwoPanelWorkspaceTest#testSinglePageDragIconWhenMultiplePageScrollingIsPossible"" into main
parents c957e68e 20e7a59b

tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java

+1 −4
Original line number Diff line number Diff line
@@ -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);