Bug 586885 - Add search suggestion preference. r=mfinkle,ibarlow
authorBrian Nicholson <bnicholson@mozilla.com>
Tue, 05 Jun 2012 14:07:14 -0700
changeset 100707 fdf5c062fd08b9410dd240c010cb643863a6c956
parent 100706 ebd1645cb66e23906cefe0a369a0d55aa70f01ef
child 100708 f7c360c110ec592748b8918168ded497398175d8
push id1316
push userakeybl@mozilla.com
push dateMon, 27 Aug 2012 22:37:00 +0000
treeherdermozilla-beta@db4b09302ee2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, ibarlow
bugs586885
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 586885 - Add search suggestion preference. r=mfinkle,ibarlow
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -79,16 +79,17 @@
 <!ENTITY pref_text_size "Text size">
 <!ENTITY pref_font_size_tiny "Tiny">
 <!ENTITY pref_font_size_small "Small">
 <!ENTITY pref_font_size_medium "Medium">
 <!ENTITY pref_font_size_large "Large">
 <!ENTITY pref_font_size_xlarge "Extra Large">
 <!ENTITY pref_use_master_password "Use master password">
 <!ENTITY pref_sync "Sync">
+<!ENTITY pref_search_suggestions "Show search suggestions">
 
 <!ENTITY quit "Quit">
 
 <!ENTITY addons "Add-ons">
 <!ENTITY downloads "Downloads">
 <!ENTITY char_encoding "Character Encoding">
 
 <!ENTITY share "Share">
--- a/mobile/android/base/resources/xml/preferences.xml
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -70,11 +70,16 @@
                             android:title="@string/pref_telemetry"
                             android:persistent="false" />
 
         <CheckBoxPreference android:key="privacy.masterpassword.enabled"
                             android:title="@string/pref_use_master_password"
                             android:defaultValue="false"
                             android:persistent="false" />
 
+        <CheckBoxPreference android:key="browser.search.suggest.enabled"
+                            android:title="@string/pref_search_suggestions"
+                            android:defaultValue="true"
+                            android:persistent="false" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -87,16 +87,17 @@
   <string name="pref_plugins_disabled">&pref_plugins_disabled;</string>
   <string name="pref_text_size">&pref_text_size;</string>
   <string name="pref_font_size_tiny">&pref_font_size_tiny;</string>
   <string name="pref_font_size_small">&pref_font_size_small;</string>
   <string name="pref_font_size_medium">&pref_font_size_medium;</string>
   <string name="pref_font_size_large">&pref_font_size_large;</string>
   <string name="pref_font_size_xlarge">&pref_font_size_xlarge;</string>
   <string name="pref_sync">&pref_sync;</string>
+  <string name="pref_search_suggestions">&pref_search_suggestions;</string>
 
   <string name="reload">&reload;</string>
   <string name="forward">&forward;</string>
   <string name="close_tab">&close_tab;</string>
   <string name="new_tab">&new_tab;</string>
   <string name="new_tab_opened">&new_tab_opened;</string>
   <string name="num_tabs">&num_tabs;</string>
   <string name="addons">&addons;</string>