commit | 8bcac711d305642efb088469378360aa1c670147 | [log] [tgz] |
---|---|---|
author | Tracy Zhou <tracyzhou@google.com> | Fri Aug 12 10:31:18 2022 -0700 |
committer | Tracy Zhou <tracyzhou@google.com> | Fri Aug 12 11:14:12 2022 -0700 |
tree | 108bff8627fb590b30580bb1a56b91f8a0c3b428 | |
parent | 6a4a229c27d80d94c02ab96efcd1c6292c9bca7e [diff] |
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
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 96622ca..fa7e8e9 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1124,6 +1124,16 @@ } @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 { return container.findObject(selector);
diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java index 0752e1e..adc993d 100644 --- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java +++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java
@@ -182,6 +182,6 @@ } boolean isTaskSplit() { - return mTask.hasObject(By.res("bottomright_snapshot")); + return mLauncher.findObjectInContainer(mTask.getParent(), "bottomright_snapshot") != null; } }