commit 1053de165e9d04d547f7ed19335c58bc4c368b35
author vadimt <vadimt@google.com> Tue May 21 11:10:03 2019 -0700
committer vadimt <vadimt@google.com> Tue May 21 11:10:03 2019 -0700
tree af06a0faa7196bd3ab9999134396c37452558f61
parent 982ea561225d9859f1dd7518fe434fec81e1c0dd

Marking sure the center of icon is not under search box in all apps

Change-Id: I9cfc9941be2bed7834d58039fbfc2741fcf50cba

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 a4d0e75..988e674 100644
--- a/tests/tapl/com/android/launcher3/tapl/AllApps.java
+++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java
@@ -18,6 +18,7 @@
 
 import static com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel.ZERO_BUTTON;
 
+import android.graphics.Point;
 import android.graphics.Rect;
 
 import androidx.annotation.NonNull;
@@ -54,13 +55,14 @@
         if (mLauncher.getNavigationModel() == ZERO_BUTTON) return true;
         final UiObject2 navBar = mLauncher.waitForSystemUiObject("navigation_bar_frame");
         if (icon.getVisibleBounds().bottom >= navBar.getVisibleBounds().top) return false;
-        if (iconIntersectsWithSearchBox(allAppsContainer, icon)) return false;
+        if (iconCenterInSearchBox(allAppsContainer, icon)) return false;
         return true;
     }
 
-    private boolean iconIntersectsWithSearchBox(UiObject2 allAppsContainer, UiObject2 icon) {
-        return Rect.intersects(icon.getVisibleBounds(),
-                getSearchBox(allAppsContainer).getVisibleBounds());
+    private boolean iconCenterInSearchBox(UiObject2 allAppsContainer, UiObject2 icon) {
+        final Point iconCenter = icon.getVisibleCenter();
+        return getSearchBox(allAppsContainer).getVisibleBounds().contains(
+                iconCenter.x, iconCenter.y);
     }
 
     /**
@@ -150,7 +152,7 @@
             }
         }
         mLauncher.assertTrue("Couldn't scroll app icon to not intersect with the search box",
-                !iconIntersectsWithSearchBox(allAppsContainer, appIcon));
+                !iconCenterInSearchBox(allAppsContainer, appIcon));
     }
 
     private UiObject2 getSearchBox(UiObject2 allAppsContainer) {