diff options
author | John Reck <jreck@google.com> | 2011-04-27 17:52:17 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-04-27 17:52:30 -0700 |
commit | f48314fcba4d6ddda8abf2e30f94112542363ca5 (patch) | |
tree | 3223079f29e6476a75d0c489d277efcf0a09d3f1 /res | |
parent | 12472f6e50bae508cdbc63fed0e11ad21daeabcf (diff) | |
download | packages_apps_Browser-f48314fcba4d6ddda8abf2e30f94112542363ca5.zip packages_apps_Browser-f48314fcba4d6ddda8abf2e30f94112542363ca5.tar.gz packages_apps_Browser-f48314fcba4d6ddda8abf2e30f94112542363ca5.tar.bz2 |
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
Diffstat (limited to 'res')
-rw-r--r-- | res/xml/debug_preferences.xml | 47 | ||||
-rw-r--r-- | res/xml/hidden_debug_preferences.xml | 67 |
2 files changed, 47 insertions, 67 deletions
diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml index 50d4c14..5126b0d 100644 --- a/res/xml/debug_preferences.xml +++ b/res/xml/debug_preferences.xml @@ -29,4 +29,51 @@ android:entryValues="@array/pref_development_ua_values" android:defaultValue="0"/> + <!-- The javascript console is enabled by default when the user has + also enabled debug mode by navigating to about:debug. --> + <CheckBoxPreference + android:key="enable_visual_indicator" + android:defaultValue="false" + android:title="@string/pref_development_visual_indicator" /> + + <CheckBoxPreference + android:key="javascript_console" + android:defaultValue="true" + android:title="@string/pref_development_error_console" /> + + <CheckBoxPreference + android:key="small_screen" + android:defaultValue="false" + android:title="@string/pref_development_single_column_rendering" /> + + <CheckBoxPreference + android:key="wide_viewport" + android:defaultValue="true" + android:title="@string/pref_development_viewport" /> + + <CheckBoxPreference + android:key="normal_layout" + android:defaultValue="false" + android:title="@string/pref_development_normal_rendering" /> + + <CheckBoxPreference + android:key="enable_tracing" + android:defaultValue="false" + android:title="@string/pref_development_trace" /> + + <CheckBoxPreference + android:key="enable_light_touch" + android:defaultValue="false" + android:title="Enable light touch" /> + + <CheckBoxPreference + android:key="enable_nav_dump" + android:defaultValue="false" + android:title="@string/pref_development_nav_dump" /> + + <EditTextPreference + android:key="js_engine_flags" + android:title="@string/js_engine_flags" + android:singleLine="true" /> + </PreferenceScreen> diff --git a/res/xml/hidden_debug_preferences.xml b/res/xml/hidden_debug_preferences.xml deleted file mode 100644 index 661d9de..0000000 --- a/res/xml/hidden_debug_preferences.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" > - - <!-- The javascript console is enabled by default when the user has - also enabled debug mode by navigating to about:debug. --> - <CheckBoxPreference - android:key="enable_visual_indicator" - android:defaultValue="false" - android:title="@string/pref_development_visual_indicator" /> - - <CheckBoxPreference - android:key="javascript_console" - android:defaultValue="true" - android:title="@string/pref_development_error_console" /> - - <CheckBoxPreference - android:key="small_screen" - android:defaultValue="false" - android:title="@string/pref_development_single_column_rendering" /> - - <CheckBoxPreference - android:key="wide_viewport" - android:defaultValue="true" - android:title="@string/pref_development_viewport" /> - - <CheckBoxPreference - android:key="normal_layout" - android:defaultValue="false" - android:title="@string/pref_development_normal_rendering" /> - - <CheckBoxPreference - android:key="enable_tracing" - android:defaultValue="false" - android:title="@string/pref_development_trace" /> - - <CheckBoxPreference - android:key="enable_light_touch" - android:defaultValue="false" - android:title="Enable light touch" /> - - <CheckBoxPreference - android:key="enable_nav_dump" - android:defaultValue="false" - android:title="@string/pref_development_nav_dump" /> - - <EditTextPreference - android:key="js_engine_flags" - android:title="@string/js_engine_flags" - android:singleLine="true" /> - -</PreferenceScreen> |