commit 5743d870bd1c8281d90d424bdcd51792413592ae
author Sunny Goyal <sunnygoyal@google.com> Tue Jan 19 13:00:08 2016 -0800
committer Sunny Goyal <sunnygoyal@google.com> Tue Jan 19 13:01:20 2016 -0800
tree 6747b979740797a3260091bfe7d5b0bedf03ab90
parent 3c0adb0729c0e8a63f745bdbe34448d358f21de8
parent b56090af3546b268b92fab7aca96c267b223db5a

resolve merge conflicts of b56090af35 to ub-launcher3-master.

Change-Id: I2ef9a25b70815efe37109004517a7c3077ffa22e

src/com/android/launcher3/BuildInfo.java

diff --git a/src/com/android/launcher3/BuildInfo.java b/src/com/android/launcher3/BuildInfo.java
deleted file mode 100644
index 1392d7a..0000000
--- a/src/com/android/launcher3/BuildInfo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.android.launcher3;
-
-// TODO: Remove this class once all its references are gone.
-public class BuildInfo {
-
-    public boolean isDogfoodBuild() {
-        return false;
-    }
-}

src/com/android/launcher3/LauncherAppState.java

diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index ad959ef..b70c3aa 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -27,6 +27,7 @@
 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.util.ConfigMonitor;
 import com.android.launcher3.util.TestingUtils;
 import com.android.launcher3.util.Thunk;
@@ -173,4 +174,8 @@
     public InvariantDeviceProfile getInvariantDeviceProfile() {
         return mInvariantDeviceProfile;
     }
+
+    public static boolean isDogfoodBuild() {
+        return FeatureFlags.IS_ALPHA_BUILD || FeatureFlags.IS_DEV_BUILD;
+    }
 }