commit e016a3c279060f9bd120cf988e74317059553681
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 15 00:29:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 15 00:29:17 2021 +0000
tree 03e6351b1be944125b507b00f104e3423a14be3f
parent 3005f36fa619572b20bd3e11a445849400de000a
parent 6f20ec39dce9ac0956691aad10f9258719a50699

Merge "Moving launcher state verification higher." into sc-v2-dev am: 6f20ec39dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15288953

Change-Id: I982958a0f01da5f07786274f785ac7904f2d66c6

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;
                     }
                 }