From a26e2d3d930aeee1cc48f9d965d8e0dbca8e3e5c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 6 May 2016 13:05:23 -0700 Subject: [PATCH] Removing some obsolete flags Change-Id: Id33e28ddd7341d2b494c4b2a294663091afdb157 --- src/com/android/launcher3/LauncherAppState.java | 5 ----- src/com/android/launcher3/config/FeatureFlags.java | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 0fe639839f..9d889e09af 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -27,7 +27,6 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.PackageInstallerCompat; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dynamicui.ExtractionUtils; import com.android.launcher3.util.ConfigMonitor; import com.android.launcher3.logging.FileLog; @@ -186,8 +185,4 @@ public class LauncherAppState { public InvariantDeviceProfile getInvariantDeviceProfile() { return mInvariantDeviceProfile; } - - public static boolean isDogfoodBuild() { - return FeatureFlags.IS_ALPHA_BUILD || FeatureFlags.IS_DEV_BUILD; - } } diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 5711a3db7a..34c6663e9e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -18,27 +18,15 @@ package com.android.launcher3.config; /** * Defines a set of flags used to control various launcher behaviors - * All the flags must be defined as - * public static boolean LAUNCHER3_FLAG_NAME = true/false; - * - * Use LAUNCHER3_ prefix for prevent namespace conflicts. */ public final class FeatureFlags { private FeatureFlags() {} - public static boolean IS_DEV_BUILD = false; - public static boolean IS_ALPHA_BUILD = false; - public static boolean IS_RELEASE_BUILD = true; - // Custom flags go below this public static boolean LAUNCHER3_DISABLE_ICON_NORMALIZATION = false; // As opposed to the new spring-loaded workspace. public static boolean LAUNCHER3_LEGACY_WORKSPACE_DND = false; public static boolean LAUNCHER3_LEGACY_FOLDER_ICON = false; - public static boolean LAUNCHER3_LEGACY_LOGGING = false; public static boolean LAUNCHER3_USE_SYSTEM_DRAG_DRIVER = false; public static boolean LAUNCHER3_DISABLE_PINCH_TO_OVERVIEW = false; - - // This flags is only defined to resolve some build issues. - public static boolean LAUNCHER3_ICON_NORMALIZATION = false; }