From 8bcac711d305642efb088469378360aa1c670147 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Fri, 12 Aug 2022 10:31:18 -0700
Subject: [PATCH] Fix overview actions tapl test failure

We don't show overview actions when the current task is a split

Fix: 242312408
Test: manual and presubmit and forrest
Change-Id: Idae64b4286d2e3143a8b0a66938802dcf0b9d3af
---
 .../launcher3/tapl/LauncherInstrumentation.java        | 10 ++++++++++
 .../tapl/com/android/launcher3/tapl/OverviewTask.java  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 96622cafbe..fa7e8e93bb 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1123,6 +1123,16 @@ public final class LauncherInstrumentation {
         return object;
     }
 
+    @Nullable
+    UiObject2 findObjectInContainer(UiObject2 container, String resName) {
+        try {
+            return container.findObject(getLauncherObjectSelector(resName));
+        } catch (StaleObjectException e) {
+            fail("The container disappeared from screen");
+            return null;
+        }
+    }
+
     @Nullable
     UiObject2 findObjectInContainer(UiObject2 container, BySelector selector) {
         try {
diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
index 0752e1e91b..adc993df94 100644
--- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
+++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
@@ -182,6 +182,6 @@ public final class OverviewTask {
     }
 
     boolean isTaskSplit() {
-        return mTask.hasObject(By.res("bottomright_snapshot"));
+        return mLauncher.findObjectInContainer(mTask.getParent(), "bottomright_snapshot") != null;
     }
 }