PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TAPL tests - make all apps in overview checks less fragile." into ub-launcher3-master

Browse Source
This commit is contained in:
Zak Cohen
2020-02-28 21:21:36 +00:00
committed by Android (Google) Code Review
parent 64a932ed2a dc24231e4f
commit 23ceafe3d5
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+3 -5
View File
@@ -81,8 +81,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
public void testAllAppsFromOverview() throws Exception {
// When actions are enabled, all apps isn't present in overview
if (mLauncher.overviewActionsEnabled()) {
if (!mLauncher.hasAllAppsInOverview()) {
return;
}
@@ -146,7 +145,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
launcher -> assertEquals("Dismissing a task didn't remove 1 task from Overview",
numTasks - 1, getTaskCount(launcher)));
if (!mLauncher.overviewActionsEnabled() && (!TestHelpers.isInLauncherProcess()
if (mLauncher.hasAllAppsInOverview() && (!TestHelpers.isInLauncherProcess()
|| getFromLauncher(launcher -> !launcher.getDeviceProfile().isLandscape))) {
// Test switching to all apps and back.
final AllAppsFromOverview allApps = overview.switchToAllApps();
@@ -190,8 +189,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
public void testAppIconLaunchFromAllAppsFromOverview() throws Exception {
// All apps doesn't exist in Overview when actions are enabled
if (mLauncher.overviewActionsEnabled()) {
if (!mLauncher.hasAllAppsInOverview()) {
return;
}