commit 6f20ec39dce9ac0956691aad10f9258719a50699
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 15 00:16:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 15 00:16:27 2021 +0000
tree c3d2ff1f17fc3184cfd941bc91a18456ec73a6a5
parent d0767c86ffeffa27b746a8793ab96baa9b978893
parent b8d13d7a700c7c6c37b51b58f09c4abeaca83c8e

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

tests/tapl/com/android/launcher3/tapl/AllApps.java

diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java
index 1cb6b2d..78301e4 100644
--- a/tests/tapl/com/android/launcher3/tapl/AllApps.java
+++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java
@@ -135,6 +135,7 @@
                                         .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 @@
                         mLauncher.assertTrue(
                                 "Exceeded max scroll attempts: " + MAX_SCROLL_ATTEMPTS,
                                 ++attempts <= MAX_SCROLL_ATTEMPTS);
-                        verifyActiveContainer();
                         scroll = newScroll;
                     }
                 }