commit 17ccbb90580443e7214f12a249a48b8b910440b3
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 17 18:40:13 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 17 18:40:13 2022 +0000
tree 9bbc6859471df315e662e5f60ee6a982d1ef806f
parent c6c6c4f539e49a29551d917a8414a4c099b871f6
parent 5b9e0cf9026f4bbeee952ba95a7e30268200ec45

Merge "Revert "Enable taskbar in overview by default"" into tm-qpr-dev am: 126d178358 am: 5b9e0cf902

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20207527

Change-Id: Id785ae174b5c77844457da44bf949280e689fcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/config/FeatureFlags.java

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index d25f980..420bd5b 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -241,7 +241,7 @@
             "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(

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index d440004..efc43ba 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -797,7 +797,7 @@
                     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);
@@ -806,7 +806,7 @@
                     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);
@@ -815,7 +815,7 @@
                     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);
@@ -827,7 +827,14 @@
                     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:
@@ -837,18 +844,6 @@
         }
     }
 
-    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(