From b8d13d7a700c7c6c37b51b58f09c4abeaca83c8e Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 14 Jul 2021 13:25:58 -0700
Subject: [PATCH] Moving launcher state verification higher.

This will result in better messages when accidentally scrolling
closes All Apps.

Test: presubmit
Bug: 187761685
Change-Id: Iadb8847ba66b1d6fe903577f67fcf3e504c2b28c
---
 tests/tapl/com/android/launcher3/tapl/AllApps.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java
index 1cb6b2debf..78301e48cd 100644
--- a/tests/tapl/com/android/launcher3/tapl/AllApps.java
+++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java
@@ -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;
                     }
                 }