Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cb519bd authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing some obsolete flags" into ub-launcher3-calgary

parents 0292bd18 a26e2d3d

src/com/android/launcher3/LauncherAppState.java

+0 −5
Original line number Diff line number Diff line
@@ -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;

    }

}

src/com/android/launcher3/config/FeatureFlags.java

+0 −12
Original line number Diff line number Diff line
@@ -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;

}