diff options
author | Leon Scroggins III <scroggo@google.com> | 2010-09-17 11:07:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 11:07:39 -0700 |
commit | 24727f19f0c01b6b3106fc0383d262a72f4487df (patch) | |
tree | a6399518fec1a47334d511cd66543d53f69e736a /res | |
parent | 06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2 (diff) | |
parent | 8774c667dd446346dca5f5d3c89092fbc86448d0 (diff) | |
download | packages_apps_Browser-24727f19f0c01b6b3106fc0383d262a72f4487df.zip packages_apps_Browser-24727f19f0c01b6b3106fc0383d262a72f4487df.tar.gz packages_apps_Browser-24727f19f0c01b6b3106fc0383d262a72f4487df.tar.bz2 |
am 8774c667: Remove "Show web suggestions" from browser settings
Merge commit '8774c667dd446346dca5f5d3c89092fbc86448d0' into gingerbread
* commit '8774c667dd446346dca5f5d3c89092fbc86448d0':
Remove "Show web suggestions" from browser settings
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 6 | ||||
-rw-r--r-- | res/xml/browser_preferences.xml | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index acf8d3d..9b7093c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -309,12 +309,6 @@ <string name="pref_content_search_engine">Set search engine</string> <!-- Settings summary --> <string name="pref_content_search_engine_summary">Select a search engine</string> - <!-- Settings label --> - <string name="pref_content_show_search_suggestions">Show web suggestions</string> - <!-- Settings summary --> - <string name="pref_content_show_web_suggestions_summary_on">Show web suggestions as you type</string> - <!-- Settings summary --> - <string name="pref_content_show_web_suggestions_summary_off">Don\'t show web suggestions as you type</string> <!-- Settings button label --> <string name="pref_use_current">Use current page</string> <!-- Settings label --> diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml index 501d8c1..1da85ec 100644 --- a/res/xml/browser_preferences.xml +++ b/res/xml/browser_preferences.xml @@ -200,13 +200,6 @@ android:summary="@string/pref_content_search_engine_summary" android:dialogTitle="@string/pref_content_search_engine" /> - <CheckBoxPreference - android:key="show_search_suggestions" - android:defaultValue="true" - android:title="@string/pref_content_show_search_suggestions" - android:summaryOn="@string/pref_content_show_web_suggestions_summary_on" - android:summaryOff="@string/pref_content_show_web_suggestions_summary_off" /> - <PreferenceScreen android:key="website_settings" android:title="@string/pref_extras_website_settings" |