Merge "Moving launcher state verification higher." into sc-v2-dev

2021-07-15 00:16:27 +00:00
parent d0767c86ff b8d13d7a70
commit 6f20ec39dc
1 changed files with 1 additions and 1 deletions
@@ -135,6 +135,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
                                        .collect(Collectors.toList()),
                                mLauncher.getVisibleBounds(searchBox).bottom
                                        - mLauncher.getVisibleBounds(allAppsContainer).top);
+                        verifyActiveContainer();
                        final int newScroll = getAllAppsScroll();
                        mLauncher.assertTrue(
                                "Scrolled in a wrong direction in AllApps: from " + scroll + " to "
@@ -144,7 +145,6 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer {
                        mLauncher.assertTrue(
                                "Exceeded max scroll attempts: " + MAX_SCROLL_ATTEMPTS,
                                ++attempts <= MAX_SCROLL_ATTEMPTS);
-                        verifyActiveContainer();
                        scroll = newScroll;
                    }
                }