Remove DEV_BUILD option
Bug: 4346867
This CL changes it so that debug itself is a "sticky" option unless
it is a release build
Change-Id: Ib2bac358270aaeb4cd3d828f26ea3947c49fb993
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 8031005..8302011 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -21,7 +21,6 @@
import android.app.ActionBar;
import android.os.Bundle;
import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
import android.view.MenuItem;
import java.util.List;
@@ -48,8 +47,7 @@
public void onBuildHeaders(List<Header> target) {
loadHeadersFromResource(R.xml.preference_headers, target);
- if (BrowserSettings.DEV_BUILD
- || BrowserSettings.getInstance().isDebugEnabled()) {
+ if (BrowserSettings.getInstance().isDebugEnabled()) {
Header debug = new Header();
debug.title = getText(R.string.pref_development_title);
debug.fragment = DebugPreferencesFragment.class.getName();
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 642fd18..5a022ef 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -25,6 +25,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.os.Build;
import android.os.Message;
import android.preference.PreferenceManager;
import android.provider.Browser;
@@ -75,8 +76,6 @@
FROYO_USERAGENT
};
- public static boolean DEV_BUILD = true;
-
private static BrowserSettings sInstance;
private Context mContext;
@@ -100,6 +99,10 @@
private BrowserSettings(Context context) {
mContext = context;
mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+ if (Build.VERSION.CODENAME.equals("REL")) {
+ // This is a release build, always startup with debug disabled
+ setDebugEnabled(false);
+ }
mAutofillHandler = new AutofillHandler(mContext);
mManagedSettings = new LinkedList<WeakReference<WebSettings>>();
mWebStorageSizeManager = new WebStorageSizeManager(mContext,
@@ -465,14 +468,14 @@
// -----------------------------
public boolean isHardwareAccelerated() {
- if (!isDebugEnabled() && !DEV_BUILD) {
+ if (!isDebugEnabled()) {
return true;
}
return mPrefs.getBoolean(PREF_ENABLE_HARDWARE_ACCEL, true);
}
public int getUserAgent() {
- if (!isDebugEnabled() && !DEV_BUILD) {
+ if (!isDebugEnabled()) {
return 0;
}
return Integer.parseInt(mPrefs.getString(PREF_USER_AGENT, "0"));
diff --git a/src/com/android/browser/preferences/DebugPreferencesFragment.java b/src/com/android/browser/preferences/DebugPreferencesFragment.java
index 42b18cc..984c12a 100644
--- a/src/com/android/browser/preferences/DebugPreferencesFragment.java
+++ b/src/com/android/browser/preferences/DebugPreferencesFragment.java
@@ -36,10 +36,6 @@
// Load the XML preferences file
addPreferencesFromResource(R.xml.debug_preferences);
- if (BrowserSettings.getInstance().isDebugEnabled()) {
- addPreferencesFromResource(R.xml.hidden_debug_preferences);
- }
-
Preference e = findPreference(PreferenceKeys.PREF_ENABLE_HARDWARE_ACCEL);
e.setOnPreferenceChangeListener(this);
}