From 58c27cce73adc8f2f191351ffc66999f0ec6997f Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 16 Feb 2022 17:42:21 -0800 Subject: [PATCH] Remove Taskbar and Taskbar EDU flags. Bug: 219035565 Change-Id: I643b5d006b5759723418901ffeb463fa04a82cbc (cherry picked from commit ec4adc1d5abedef149f6c4682464f7f4b1a6b313) --- .../launcher3/taskbar/LauncherTaskbarUIController.java | 7 +------ .../src/com/android/launcher3/taskbar/TaskbarManager.java | 3 +-- src/com/android/launcher3/DeviceProfile.java | 3 +-- src/com/android/launcher3/config/FeatureFlags.java | 6 ------ 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 0f91aa2822..af53ae22d2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -228,8 +228,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { * Whether the taskbar education should be shown. */ public boolean shouldShowEdu() { - return FeatureFlags.ENABLE_TASKBAR_EDU.get() - && !Utilities.IS_RUNNING_IN_TEST_HARNESS + return !Utilities.IS_RUNNING_IN_TEST_HARNESS && !mLauncher.getOnboardingPrefs().getBoolean(OnboardingPrefs.TASKBAR_EDU_SEEN); } @@ -237,10 +236,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController { * Manually ends the taskbar education flow. */ public void hideEdu() { - if (!FeatureFlags.ENABLE_TASKBAR_EDU.get()) { - return; - } - mControllers.taskbarEduController.hideEdu(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 50be430d93..0f7abda714 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -236,8 +236,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen DeviceProfile dp = mUserUnlocked ? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext) : null; - boolean isTaskBarEnabled = - FeatureFlags.ENABLE_TASKBAR.get() && dp != null && dp.isTaskbarPresent; + boolean isTaskBarEnabled = dp != null && dp.isTaskbarPresent; if (!isTaskBarEnabled) { SystemUiProxy.INSTANCE.get(mContext) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 62703ad2e0..caa9da7732 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -244,8 +244,7 @@ public class DeviceProfile { isTablet = info.isTablet(windowBounds); isPhone = !isTablet; isTwoPanels = isTablet && useTwoPanels; - isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS - && FeatureFlags.ENABLE_TASKBAR.get(); + isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS; // Some more constants. context = getContext(context, info, isVerticalBarLayout() || (isTablet && isLandscape) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 6116c66fe9..8b2184d8fe 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -197,12 +197,6 @@ public final class FeatureFlags { "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app " + "predictions to be updated while they are visible to the user."); - public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag( - "ENABLE_TASKBAR", true, "Allows a system Taskbar to be shown on larger devices."); - - public static final BooleanFlag ENABLE_TASKBAR_EDU = getDebugFlag("ENABLE_TASKBAR_EDU", true, - "Enables showing taskbar education the first time an app is opened."); - public static final BooleanFlag ENABLE_TASKBAR_POPUP_MENU = getDebugFlag( "ENABLE_TASKBAR_POPUP_MENU", true, "Enables long pressing taskbar icons to show the" + " popup menu.");