commit 41e171143b786c833d1033d1980ee1c8976dc14e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 08 19:19:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 08 19:19:20 2021 +0000
tree d5f96be79a06cdbd421ef9b6b87b59e3b1dd06cf
parent 800336ecadf617c422175145ab6d85be0a43a926
parent 399a39185782329ce3f77712a6762a8087cb4281

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

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

Change-Id: I03a1fe2e9960437b6f524948f1b528f76bca2e60

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;
         }