Merge "Moving IS_DEBUG_DEVICE to a compile time flag for better proguard support" into tm-qpr-dev (ae030217) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Utilities.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -131,10 +131,10 @@ public final class Utilities {
		/**
		* Indicates if the device has a debug build. Should only be used to store additional info or
		* add extra logging and not for changing the app behavior.
		* @deprecated Use {@link BuildConfig#IS_DEBUG_DEVICE} directly
		*/
		public static final boolean IS_DEBUG_DEVICE =
		Build.TYPE.toLowerCase(Locale.ROOT).contains("debug") \|\|
		Build.TYPE.toLowerCase(Locale.ROOT).equals("eng");
		@Deprecated
		public static final boolean IS_DEBUG_DEVICE = BuildConfig.IS_DEBUG_DEVICE;

		/**
		* Returns true if theme is dark.

+6 −2

Original line number	Diff line number	Diff line
		@@ -42,18 +42,22 @@ public final class FeatureFlags {
		}

		public static boolean showFlagTogglerUi(Context context) {
		return Utilities.IS_DEBUG_DEVICE && Utilities.isDevelopersOptionsEnabled(context);
		return BuildConfig.IS_DEBUG_DEVICE && Utilities.isDevelopersOptionsEnabled(context);
		}

		/**
		* True when the build has come from Android Studio and is being used for local debugging.
		* @deprecated Use {@link BuildConfig#IS_STUDIO_BUILD} directly
		*/
		public static final boolean IS_STUDIO_BUILD = BuildConfig.DEBUG;
		@Deprecated
		public static final boolean IS_STUDIO_BUILD = BuildConfig.IS_STUDIO_BUILD;

		/**
		* Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
		* and should be modified at a project level.
		* @deprecated Use {@link BuildConfig#QSB_ON_FIRST_SCREEN} directly
		*/
		@Deprecated
		public static final boolean QSB_ON_FIRST_SCREEN = BuildConfig.QSB_ON_FIRST_SCREEN;

		/**

+7 −1

Original line number	Diff line number	Diff line
		@@ -18,10 +18,16 @@ package com.android.launcher3;

		public final class BuildConfig {
		public static final String APPLICATION_ID = "com.android.launcher3";
		public static final boolean DEBUG = false;

		public static final boolean IS_STUDIO_BUILD = false;
		/**
		* Flag to state if the QSB is on the first screen and placed on the top,
		* this can be overwritten in other launchers with a different value, if needed.
		*/
		public static final boolean QSB_ON_FIRST_SCREEN = true;

		/**
		* Flag to control various developer centric features
		*/
		public static final boolean IS_DEBUG_DEVICE = false;
		}