From da75737d63f4aec3915cc1ee89332c181af0f6ed Mon Sep 17 00:00:00 2001 From: Jeremy Sim Date: Tue, 14 Mar 2023 13:53:05 -0700 Subject: [PATCH] Revert "Revert "Create TAPL test suite for splitscreen"" This reverts commit 313a44039f9bd3723996cf55082ed6e2753921e5. Merging will reenable the TAPL suite TaplTestsSplitscreen.java, which was failing on phones due to a function call that only works on tablets. Fixed by conditionally running the function only on tablet devices. Fixes: 271852893 Test: Ran tests locally on phone and tablet. Change-Id: If3e692924ed9c5ee113872e4f8ff0652890d1280 --- .../android/quickstep/views/RecentsView.java | 3 + .../quickstep/TaplTestsSplitscreen.java | 82 +++++++++++++++++++ .../android/launcher3/tapl/AppIconMenu.java | 9 ++ .../android/launcher3/tapl/Launchable.java | 21 +++++ .../android/launcher3/tapl/OverviewTask.java | 7 +- .../launcher3/tapl/SplitScreenMenuItem.java | 55 +++++++++++++ 6 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java create mode 100644 tests/tapl/com/android/launcher3/tapl/SplitScreenMenuItem.java diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 4ba02769a5..7c0cc2d8c4 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -147,6 +147,8 @@ import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; +import com.android.launcher3.testing.TestLogging; +import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.touch.OverScroll; import com.android.launcher3.touch.PagedOrientationHandler; import com.android.launcher3.util.DynamicResource; @@ -4497,6 +4499,7 @@ public abstract class RecentsView