From 6f0b0fe742663759216ddec52d6a35445d30662c Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 17 Oct 2022 14:38:09 +0000 Subject: [PATCH] Revert "Enable taskbar in overview by default" This reverts commit 517131ae1c634830bffe0e3cf4ce9ff5f03e8efe. Reason for revert: Reverting until b/251747761 is addressed Bug: 245320601 Change-Id: Ic5ebc071f092c8f91ff879a59d89c3be4326c90e --- .../launcher3/config/FeatureFlags.java | 2 +- .../tapl/LauncherInstrumentation.java | 27 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 030ac7efcc..3a530affad 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -241,7 +241,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", true, + "ENABLE_TASKBAR_IN_OVERVIEW", false, "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 677960df96..3545c27d24 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -781,7 +781,7 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(APPS_RES_ID); waitUntilLauncherObjectGone(WORKSPACE_RES_ID); waitUntilLauncherObjectGone(WIDGETS_RES_ID); - checkTaskbarVisibility(); + waitUntilLauncherObjectGone(TASKBAR_RES_ID); waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID); return waitForLauncherObject(OVERVIEW_RES_ID); @@ -790,7 +790,7 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(APPS_RES_ID); waitUntilLauncherObjectGone(WORKSPACE_RES_ID); waitUntilLauncherObjectGone(WIDGETS_RES_ID); - checkTaskbarVisibility(); + waitUntilLauncherObjectGone(TASKBAR_RES_ID); waitForLauncherObject(SPLIT_PLACEHOLDER_RES_ID); return waitForLauncherObject(OVERVIEW_RES_ID); @@ -799,7 +799,7 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(APPS_RES_ID); waitUntilLauncherObjectGone(WORKSPACE_RES_ID); waitUntilLauncherObjectGone(WIDGETS_RES_ID); - checkTaskbarVisibility(); + waitUntilLauncherObjectGone(TASKBAR_RES_ID); waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID); return waitForFallbackLauncherObject(OVERVIEW_RES_ID); @@ -811,7 +811,14 @@ public final class LauncherInstrumentation { waitUntilLauncherObjectGone(WIDGETS_RES_ID); waitUntilLauncherObjectGone(SPLIT_PLACEHOLDER_RES_ID); - checkTaskbarVisibility(); + if (mIgnoreTaskbarVisibility) { + return null; + } + if (isTablet() && !isFallbackOverview()) { + waitForLauncherObject(TASKBAR_RES_ID); + } else { + waitUntilLauncherObjectGone(TASKBAR_RES_ID); + } return null; } default: @@ -821,18 +828,6 @@ public final class LauncherInstrumentation { } } - private void checkTaskbarVisibility() { - if (mIgnoreTaskbarVisibility) { - return; - } - - if (isTablet() && !isFallbackOverview()) { - waitForLauncherObject(TASKBAR_RES_ID); - } else { - waitUntilLauncherObjectGone(TASKBAR_RES_ID); - } - } - public void waitForLauncherInitialized() { for (int i = 0; i < 100; ++i) { if (getTestInfo(