summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVinit Nayak <peanutbutter@google.com>2022-02-16 17:42:21 -0800
committerVinit Nayak <peanutbutter@google.com>2022-02-23 18:14:28 +0000
commit58c27cce73adc8f2f191351ffc66999f0ec6997f (patch)
tree71fddab0199efb8c969d7dccf58355082d1d5fde /src
parentbfb275bf21b1b8019a503360ad59588d3d1b8fca (diff)
downloadLauncher3-58c27cce73adc8f2f191351ffc66999f0ec6997f.tar.gz
Remove Taskbar and Taskbar EDU flags.
Bug: 219035565 Change-Id: I643b5d006b5759723418901ffeb463fa04a82cbc (cherry picked from commit ec4adc1d5abedef149f6c4682464f7f4b1a6b313)
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java3
-rw-r--r--src/com/android/launcher3/config/FeatureFlags.java6
2 files changed, 1 insertions, 8 deletions
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.");