Add m-esr52 at 52.6.0

15 files changed, 599 insertions, 0 deletions

diff --git a/mobile/android/base/resources/xml/preference_headers.xml b/mobile/android/base/resources/xml/preference_headers.xml
new file mode 100644
index 000000000..e17c9bd77
--- /dev/null
+++ b/mobile/android/base/resources/xml/preference_headers.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- This file is a stub to allow IDs to be used in code
+     even for a version-limited build. -->
+
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:id="@+id/pref_header_search">
+    </header>
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:id="@+id/pref_header_notifications">
+    </header>
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:id="@+id/pref_header_advanced">
+    </header>
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:id="@+id/pref_header_accessibility">
+    </header>
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:id="@+id/pref_header_clear_private_data">
+    </header>
+</preference-headers>
diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml
new file mode 100644
index 000000000..06716cd9a
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- See xml-v11/preference_headers.xml for tablet layout. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:enabled="false">
+
+    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
+                                                  android:title="@string/pref_sync"
+                                                  android:icon="@drawable/sync_avatar_default"
+                                                  android:summary="@string/pref_sync_summary"
+                                                  android:persistent="false" />
+
+    <PreferenceScreen android:title="@string/pref_category_general"
+                      android:summary="@string/pref_category_general_summary"
+                      android:key="android.not_a_preference.general_screen"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_general"/>
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_search"
+                      android:summary="@string/pref_category_search_summary"
+                      android:key="android.not_a_preference.search_screen"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_search"/>
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_privacy_short"
+                      android:summary="@string/pref_category_privacy_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_privacy" />
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_accessibility"
+                      android:summary="@string/pref_category_accessibility_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_accessibility" />
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_notifications"
+        android:summary="@string/pref_category_notifications_summary"
+        android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment">
+        <extra android:name="resource"
+            android:value="preferences_notifications"/>
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_advanced"
+                      android:summary="@string/pref_category_advanced_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+                      android:key="android.not_a_preference.advanced_screen" >
+        <extra android:name="resource"
+               android:value="preferences_advanced"/>
+    </PreferenceScreen>
+
+    <org.mozilla.gecko.preferences.PrivateDataPreference
+            android:key="android.not_a_preference.privacy.clear"
+            android:title="@string/pref_clear_private_data_now"
+            android:persistent="true"
+            android:positiveButtonText="@string/button_clear_data"
+            gecko:entries="@array/pref_private_data_entries"
+            gecko:entryValues="@array/pref_private_data_values"
+            gecko:entryKeys="@array/pref_private_data_keys"
+            gecko:initialValues="@array/pref_private_data_defaults" />
+
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.default_browser.link"
+                                                  android:title="@string/pref_default_browser"
+                                                  android:persistent="false"
+                                                  url="https://support.mozilla.org/kb/make-firefox-default-browser-android?utm_source=inproduct&amp;utm_medium=settings&amp;utm_campaign=mobileandroid"/>
+
+    <PreferenceScreen android:title="@string/pref_category_vendor"
+                      android:summary="@string/pref_category_vendor_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_vendor"/>
+    </PreferenceScreen>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_accessibility.xml b/mobile/android/base/resources/xml/preferences_accessibility.xml
new file mode 100644
index 000000000..8e352f1fd
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_accessibility.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/pref_category_accessibility"
+                  android:enabled="false">
+
+    <org.mozilla.gecko.preferences.FontSizePreference
+                    android:key="font.size.inflation.minTwips"
+                    android:title="@string/pref_text_size"
+                    android:positiveButtonText="@string/pref_font_size_set"
+                    android:negativeButtonText="@string/button_cancel"
+                    android:persistent="false" />
+
+    <SwitchPreference android:key="browser.ui.zoom.force-user-scalable"
+                      android:title="@string/pref_zoom_force_enabled"
+                      android:summary="@string/pref_zoom_force_enabled_summary" />
+
+    <SwitchPreference android:key="ui.zoomedview.enabled"
+                      android:title="@string/pref_magnifying_glass_enabled"
+                      android:summary="@string/pref_magnifying_glass_enabled_summary" />
+
+    <SwitchPreference android:key="android.not_a_preference.voice_input_enabled"
+                      android:title="@string/pref_voice_input"
+                      android:summary="@string/pref_voice_input_summary"
+                      android:defaultValue="true"/>
+
+    <SwitchPreference android:key="android.not_a_preference.qrcode_enabled"
+                      android:title="@string/pref_qrcode_enabled"
+                      android:summary="@string/pref_qrcode_enabled_summary"
+                      android:defaultValue="true"/>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_advanced.xml b/mobile/android/base/resources/xml/preferences_advanced.xml
new file mode 100644
index 000000000..32cdf0b91
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_advanced.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_advanced"
+                  android:enabled="false">
+
+    <org.mozilla.gecko.preferences.AndroidImportPreference
+            android:key="android.not_a_preference.import_android"
+            gecko:entries="@array/pref_import_android_entries"
+            gecko:entryValues="@array/pref_import_android_values"
+            gecko:initialValues="@array/pref_import_android_defaults"
+            android:title="@string/pref_import_android"
+            android:summary="@string/pref_import_android_summary"
+            android:positiveButtonText="@string/bookmarkhistory_button_import"
+            android:negativeButtonText="@string/button_cancel"
+            android:persistent="false" />
+
+    <ListPreference android:key="app.update.autodownload"
+                    android:title="@string/pref_update_autodownload"
+                    android:entries="@array/pref_update_autodownload_entries"
+                    android:entryValues="@array/pref_update_autodownload_values"
+                    android:persistent="false" />
+
+    <ListPreference android:key="android.not_a_preference.restoreSession3"
+                    android:title="@string/pref_restore"
+                    android:defaultValue="always"
+                    android:entries="@array/pref_restore_entries"
+                    android:entryValues="@array/pref_restore_values"
+                    android:persistent="true" />
+
+    <ListPreference android:key="browser.menu.showCharacterEncoding"
+                    android:title="@string/pref_char_encoding"
+                    android:entries="@array/pref_char_encoding_entries"
+                    android:entryValues="@array/pref_char_encoding_values"
+                    android:persistent="false" />
+
+    <PreferenceCategory android:title="@string/pref_category_data_saver">
+
+        <ListPreference android:key="browser.image_blocking"
+                        android:title="@string/pref_tap_to_load_images_title2"
+                        android:entries="@array/pref_browser_image_blocking_entries"
+                        android:entryValues="@array/pref_browser_image_blocking_values"
+                        android:persistent="false" />
+
+        <SwitchPreference android:key="browser.display.use_document_fonts"
+                          android:title="@string/pref_show_web_fonts"
+                          android:summary="@string/pref_show_web_fonts_summary"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_category_media">
+
+        <ListPreference android:key="plugin.enable"
+                        android:title="@string/pref_plugins"
+                        android:entries="@array/pref_plugins_entries"
+                        android:entryValues="@array/pref_plugins_values"
+                        android:persistent="false" />
+
+        <SwitchPreference android:key="media.autoplay.enabled"
+                          android:title="@string/pref_media_autoplay_enabled"
+                          android:summary="@string/pref_media_autoplay_enabled_summary" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_category_developer_tools">
+
+        <SwitchPreference android:key="devtools.remote.usb.enabled"
+                          android:title="@string/pref_developer_remotedebugging_usb" />
+
+        <SwitchPreference android:key="devtools.remote.wifi.enabled"
+                          android:title="@string/pref_developer_remotedebugging_wifi" />
+
+        <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
+                                                                android:title="@string/pref_learn_more"
+                                                                android:persistent="false"
+                                                                url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="android.not_a_preference.category_experimental"
+        android:title="@string/pref_category_experimental">
+
+        <SwitchPreference android:key="android.not_a_preference.activitystream"
+            android:title="@string/pref_activity_stream"
+            android:summary="@string/pref_activity_stream_summary"
+            android:defaultValue="false" />
+
+
+        <SwitchPreference android:key="android.not_a_preference.customtabs"
+            android:title="@string/pref_custom_tabs"
+            android:summary="@string/pref_custom_tabs_summary"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_general.xml b/mobile/android/base/resources/xml/preferences_general.xml
new file mode 100644
index 000000000..f50bceb55
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_general.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Changes should be mirrored to preferences_general_tablet.xml. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:enabled="false">
+
+    <PreferenceScreen android:key="android.not_a_preference.general_home"
+                      android:title="@string/pref_category_home"
+                      android:summary="@string/pref_category_home_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+            <extra android:name="resource"
+                   android:value="preferences_home" />
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_language"
+                      android:summary="@string/pref_category_language_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_locale" />
+    </PreferenceScreen>
+
+    <SwitchPreference android:key="browser.chrome.dynamictoolbar"
+                      android:title="@string/pref_scroll_title_bar2"
+                      android:summary="@string/pref_scroll_title_bar_summary" />
+
+    <SwitchPreference android:key="android.not_a_preference.tab_queue"
+                      android:title="@string/pref_tab_queue_title"
+                      android:summary="@string/pref_tab_queue_summary"
+                      android:defaultValue="false" />
+
+</PreferenceScreen>
+
diff --git a/mobile/android/base/resources/xml/preferences_general_tablet.xml b/mobile/android/base/resources/xml/preferences_general_tablet.xml
new file mode 100644
index 000000000..f05be9827
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_general_tablet.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Tablet only: The contents under the "General" header for tablets,
+     See xml-v11/preferences.xml for single-pane v11+ phone layout.
+     Changes to preferences should be mirrored to preferences_general.xml. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/pref_category_general"
+                  android:enabled="false">
+
+    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
+                                                  android:title="@string/pref_sync"
+                                                  android:persistent="false" />
+
+    <PreferenceScreen android:key="android.not_a_preference.general_home"
+                      android:title="@string/pref_category_home"
+                      android:summary="@string/pref_category_home_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+            <extra android:name="resource"
+                   android:value="preferences_home" />
+    </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_language"
+                      android:summary="@string/pref_category_language_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_locale" />
+    </PreferenceScreen>
+
+    <SwitchPreference android:key="browser.chrome.dynamictoolbar"
+                      android:title="@string/pref_scroll_title_bar2"
+                      android:summary="@string/pref_scroll_title_bar_summary" />
+
+    <SwitchPreference android:key="android.not_a_preference.tab_queue"
+                      android:title="@string/pref_tab_queue_title"
+                      android:summary="@string/pref_tab_queue_summary"
+                      android:defaultValue="false" />
+
+</PreferenceScreen>
+
diff --git a/mobile/android/base/resources/xml/preferences_home.xml b/mobile/android/base/resources/xml/preferences_home.xml
new file mode 100644
index 000000000..ecc90e093
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_home.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/pref_category_home"
+                  android:enabled="false">
+
+    <PreferenceCategory android:title="@string/pref_category_home_homepage"
+                        android:key="android.not_a_preference.category_homepage">
+
+        <org.mozilla.gecko.preferences.SetHomepagePreference
+                android:key="android.not_a_preference.homepage"
+                android:title="@string/home_homepage_title"
+                android:persistent="false"
+                android:dialogLayout="@layout/preference_set_homepage"/>
+
+    </PreferenceCategory>
+
+    <org.mozilla.gecko.preferences.PanelsPreferenceCategory
+        android:title="@string/pref_category_home_panels"/>
+
+    <PreferenceCategory android:title="@string/pref_category_home_add_ons">
+
+        <ListPreference android:key="home.sync.updateMode"
+                        android:title="@string/pref_home_updates"
+                        android:entries="@array/pref_home_updates_entries"
+                        android:entryValues="@array/pref_home_updates_values"
+                        android:persistent="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_locale.xml b/mobile/android/base/resources/xml/preferences_locale.xml
new file mode 100644
index 000000000..80173c8e0
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_locale.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_language"
+                  android:enabled="false">
+    <PreferenceCategory android:title="@string/pref_browser_locale">
+        <!-- No title set here. We set the title to the current locale in
+             GeckoPreferences. -->
+        <org.mozilla.gecko.preferences.LocaleListPreference
+            android:key="locale"
+            android:persistent="true"
+            android:defaultValue=""
+        />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_notifications.xml b/mobile/android/base/resources/xml/preferences_notifications.xml
new file mode 100644
index 000000000..b9080d110
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_notifications.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference android:key="android.not_a_preference.notifications.content"
+        android:title="@string/pref_content_notifications"
+        android:summary="@string/pref_content_notifications_summary"
+        android:defaultValue="true" />
+    <org.mozilla.gecko.preferences.AlignRightLinkPreference
+        android:key="android.not_a_preference.notifications.content.learn_more"
+        android:title="@string/pref_learn_more"
+        android:persistent="false"
+        url="https://support.mozilla.org/kb/notifications-firefox-android?utm_source=inproduct&amp;utm_medium=notifications&amp;utm_campaign=mobileandroid" />
+    <SwitchPreference android:key="android.not_a_preference.notifications.whats_new"
+        android:title="@string/pref_whats_new_notification"
+        android:summary="@string/pref_whats_new_notification_summary"
+        android:defaultValue="true" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/mobile/android/base/resources/xml/preferences_privacy.xml b/mobile/android/base/resources/xml/preferences_privacy.xml
new file mode 100644
index 000000000..7b3215cb2
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_privacy.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_privacy_short"
+                  android:enabled="false">
+
+    <SwitchPreference android:key="privacy.donottrackheader.enabled"
+                      android:title="@string/pref_donottrack_title"
+                      android:summary="@string/pref_donottrack_summary"
+                      android:persistent="false" />
+
+    <org.mozilla.gecko.preferences.AlignRightLinkPreference
+            android:key="android.not_a_preference.donottrackheader.learn_more"
+            android:title="@string/pref_learn_more"
+            android:persistent="false"
+            url="https://www.mozilla.org/firefox/dnt/" />
+
+    <CheckBoxPreference android:key="privacy.trackingprotection.pbmode.enabled"
+                        android:title="@string/pref_tracking_protection_title"
+                        android:summary="@string/pref_tracking_protection_summary"
+                        android:persistent="false" />
+
+    <ListPreference android:key="privacy.trackingprotection.state"
+                    android:title="@string/pref_tracking_protection_title"
+                    android:entries="@array/pref_tracking_protection_entries"
+                    android:entryValues="@array/pref_tracking_protection_values"
+                    android:persistent="false" />
+
+    <org.mozilla.gecko.preferences.AlignRightLinkPreference
+            android:key="android.not_a_preference.trackingprotection.learn_more"
+            android:title="@string/pref_learn_more"
+            android:persistent="false"
+            url="https://support.mozilla.org/kb/firefox-android-tracking-protection" />
+
+    <ListPreference android:key="network.cookie.cookieBehavior"
+                    android:title="@string/pref_cookies_menu"
+                    android:entries="@array/pref_cookies_entries"
+                    android:entryValues="@array/pref_cookies_values"
+                    android:persistent="false" />
+
+
+    <!-- This pref is persisted in both Gecko and Java -->
+    <org.mozilla.gecko.preferences.ListCheckboxPreference
+                        android:key="android.not_a_preference.history.clear_on_exit"
+                        gecko:entries="@array/pref_private_data_entries"
+                        gecko:entryValues="@array/pref_private_data_values"
+                        gecko:initialValues="@array/pref_clear_on_exit_defaults"
+
+                        android:title="@string/pref_clear_on_exit_title"
+                        android:summary="@string/pref_clear_on_exit_summary2"
+
+                        android:dialogTitle="@string/pref_clear_on_exit_dialog_title"
+                        android:positiveButtonText="@string/button_set"/>
+
+    <PreferenceCategory android:title="@string/pref_category_logins">
+
+        <org.mozilla.gecko.preferences.LinkPreference
+            android:key="android.not_a_preference.signon.manage"
+            android:title="@string/pref_manage_logins"
+            url="about:logins"/>
+
+        <CheckBoxPreference
+            android:key="signon.rememberSignons"
+            android:title="@string/pref_remember_signons"
+            android:persistent="false" />
+
+        <CheckBoxPreference
+            android:key="privacy.masterpassword.enabled"
+            android:title="@string/pref_use_master_password"
+            android:persistent="false" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="android.not_a_preference.datareporting.preferences"
+                        android:title="@string/pref_category_datareporting">
+
+        <CheckBoxPreference android:key="toolkit.telemetry.enabled"
+                            android:title="@string/datareporting_telemetry_title"
+                            android:summary="@string/datareporting_telemetry_summary" />
+
+        <CheckBoxPreference android:key="datareporting.crashreporter.submitEnabled"
+                            android:title="@string/datareporting_crashreporter_title_short"
+                            android:summary="@string/datareporting_crashreporter_summary"
+                            android:defaultValue="false" />
+
+        <CheckBoxPreference android:key="android.not_a_preference.app.geo.reportdata"
+                            android:title="@string/datareporting_wifi_title"
+                            android:summary="@string/datareporting_wifi_geolocation_summary" />
+
+        <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.geo.learn_more"
+                                                                android:title="@string/pref_learn_more"
+                                                                android:persistent="false"
+                                                                url="https://location.services.mozilla.com/" />
+
+        <CheckBoxPreference android:key="android.not_a_preference.healthreport.uploadEnabled"
+                            android:title="@string/datareporting_fhr_title"
+                            android:summary="@string/datareporting_fhr_summary2"
+                            android:defaultValue="true" />
+
+        <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.healthreport.link"
+                                                                android:title="@string/datareporting_abouthr_title"
+                                                                android:persistent="false"
+                                                                url="about:healthreport" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
+
diff --git a/mobile/android/base/resources/xml/preferences_search.xml b/mobile/android/base/resources/xml/preferences_search.xml
new file mode 100644
index 000000000..440167fe5
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_search.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_search"
+                  android:enabled="false">
+
+    <PreferenceCategory android:title="@string/pref_category_add_search_providers">
+
+        <org.mozilla.gecko.preferences.ModifiableHintPreference
+                android:layout="@layout/preference_search_tip"
+                android:enabled="false"
+                android:selectable="false"/>
+
+    </PreferenceCategory>
+
+    <org.mozilla.gecko.preferences.SearchPreferenceCategory
+                        android:title="@string/pref_category_installed_search_engines"/>
+
+    <PreferenceCategory android:title="@string/pref_category_search_restore_defaults">
+
+        <Preference android:key="android.not_a_preference.search.restore_defaults"
+                    android:title="@string/pref_search_restore_defaults_summary" />
+
+    </PreferenceCategory>
+
+    <CheckBoxPreference android:key="browser.search.suggest.enabled"
+                        android:title="@string/pref_search_suggestions"
+                        android:defaultValue="false"
+                        android:persistent="false" />
+
+    <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
+                        android:title="@string/pref_history_search_suggestions"
+                        android:defaultValue="true"
+                        android:persistent="true" />
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_vendor.xml b/mobile/android/base/resources/xml/preferences_vendor.xml
new file mode 100644
index 000000000..38eba9d30
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_vendor.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_vendor"
+                  android:enabled="false">
+
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.about.link"
+                                                  android:title="@string/pref_about_firefox"
+                                                  android:persistent="false"
+                                                  url="about:" />
+
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.faq.link"
+                                                  android:title="@string/pref_vendor_faqs"
+                                                  android:persistent="false"/>
+
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.feedback.link"
+                                                  android:title="@string/pref_vendor_feedback"
+                                                  android:persistent="false"/>
+
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/search_preferences.xml b/mobile/android/base/resources/xml/search_preferences.xml
new file mode 100644
index 000000000..510e3f425
--- /dev/null
+++ b/mobile/android/base/resources/xml/search_preferences.xml
@@ -0,0 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:key="search.not_a_preference.clear_history"
+        android:title="@string/pref_clearHistory_title"/>
+</PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/search_widget_info.xml b/mobile/android/base/resources/xml/search_widget_info.xml
new file mode 100644
index 000000000..7fd66f7ed
--- /dev/null
+++ b/mobile/android/base/resources/xml/search_widget_info.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="250dp"
+    android:minHeight="40dp"
+    android:label="@string/search_widget_name"
+    android:widgetCategory="home_screen"
+    android:previewImage="@drawable/launcher_widget"
+    android:initialLayout="@layout/search_widget"/>
diff --git a/mobile/android/base/resources/xml/searchable.xml b/mobile/android/base/resources/xml/searchable.xml
new file mode 100644
index 000000000..3cd7333bd
--- /dev/null
+++ b/mobile/android/base/resources/xml/searchable.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+            android:label="@string/moz_app_displayname"
+            android:searchSuggestAuthority="@string/content_authority_db_browser"
+            android:searchSuggestIntentAction="android.intent.action.SEARCH"
+            android:searchSettingsDescription="@string/searchable_description"
+            android:includeInGlobalSearch="true"/>