diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-01-19 13:00:08 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-01-19 13:01:20 -0800 |
| commit | 5743d870bd1c8281d90d424bdcd51792413592ae (patch) | |
| tree | 6747b979740797a3260091bfe7d5b0bedf03ab90 /src | |
| parent | 3c0adb0729c0e8a63f745bdbe34448d358f21de8 (diff) | |
| parent | b56090af3546b268b92fab7aca96c267b223db5a (diff) | |
| download | android_packages_apps_Trebuchet-5743d870bd1c8281d90d424bdcd51792413592ae.tar.gz android_packages_apps_Trebuchet-5743d870bd1c8281d90d424bdcd51792413592ae.tar.bz2 android_packages_apps_Trebuchet-5743d870bd1c8281d90d424bdcd51792413592ae.zip | |
resolve merge conflicts of b56090af35 to ub-launcher3-master.
Change-Id: I2ef9a25b70815efe37109004517a7c3077ffa22e
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/BuildInfo.java | 9 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/launcher3/BuildInfo.java b/src/com/android/launcher3/BuildInfo.java deleted file mode 100644 index 1392d7a43..000000000 --- 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; - } -} diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index ad959ef8c..b70c3aa47 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -27,6 +27,7 @@ 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.util.ConfigMonitor; import com.android.launcher3.util.TestingUtils; import com.android.launcher3.util.Thunk; @@ -173,4 +174,8 @@ public class LauncherAppState { public InvariantDeviceProfile getInvariantDeviceProfile() { return mInvariantDeviceProfile; } + + public static boolean isDogfoodBuild() { + return FeatureFlags.IS_ALPHA_BUILD || FeatureFlags.IS_DEV_BUILD; + } } |