commit 399a39185782329ce3f77712a6762a8087cb4281
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 08 19:03:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 08 19:03:29 2021 +0000
tree 2a8990da0040b43748d2106968e826e91312c504
parent ad42bf08d1471edad631e4ae746fcff036f2f475
parent f87a7409b218a2e506e5e260cd3e28e351f78a62

Merge "isable taskbar edu for tests" into sc-v2-dev am: f87a7409b2

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

Change-Id: I6ad67a8f9bbbc07bfea4caf7792e7a9e4d421085

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index b172095..764b0d3 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -33,6 +33,7 @@
 import com.android.launcher3.LauncherState;
 import com.android.launcher3.QuickstepTransitionManager;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.ItemInfoWithIcon;
@@ -285,6 +286,7 @@
      */
     public void showEdu() {
         if (!FeatureFlags.ENABLE_TASKBAR_EDU.get()
+                || Utilities.IS_RUNNING_IN_TEST_HARNESS
                 || mLauncher.getOnboardingPrefs().getBoolean(OnboardingPrefs.TASKBAR_EDU_SEEN)) {
             return;
         }