From 5dec2aceb16338f85c4179dde94805b139afcf31 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Tue, 6 Dec 2022 19:34:44 +0000 Subject: [PATCH] Revert "Revert "Enable taskbar in overview by default"" This reverts commit 6f0b0fe742663759216ddec52d6a35445d30662c. Bug: 245320601 Reason for revert: Re-land "Enable taskbar in overview by default" Change-Id: Ie722a608d6bd7168744ffc81c156e4307d4c1d2d --- src/com/android/launcher3/config/FeatureFlags.java | 2 +- .../launcher3/tapl/LauncherInstrumentation.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 88654b735d..b299a5fd84 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -247,7 +247,7 @@ public final class FeatureFlags { "Enables One Search box in Taskbar All Apps."); public static final BooleanFlag ENABLE_TASKBAR_IN_OVERVIEW = getDebugFlag( - "ENABLE_TASKBAR_IN_OVERVIEW", false, + "ENABLE_TASKBAR_IN_OVERVIEW", true, "Enables accessing the system Taskbar in overview."); public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag( diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index c3ea14ae85..fcff3fa08e 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -827,7 +827,11 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(APPS_RES_ID); waitUntilLauncherObjectGone(WORKSPACE_RES_ID); waitUntilLauncherObjectGone(WIDGETS_RES_ID); - waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID); + if (isTablet()) { + waitForSystemLauncherObject(TASKBAR_RES_ID); + } else { + waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID); + } waitUntilSystemLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID); return waitForSystemLauncherObject(OVERVIEW_RES_ID); @@ -836,7 +840,11 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(APPS_RES_ID); waitUntilLauncherObjectGone(WORKSPACE_RES_ID); waitUntilLauncherObjectGone(WIDGETS_RES_ID); - waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID); + if (isTablet()) { + waitForSystemLauncherObject(TASKBAR_RES_ID); + } else { + waitUntilSystemLauncherObjectGone(TASKBAR_RES_ID); + } waitForSystemLauncherObject(SPLIT_PLACEHOLDER_RES_ID); return waitForSystemLauncherObject(OVERVIEW_RES_ID);