From 74c61d1fef35feea961b4302d77dacda708c4805 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 17 Nov 2017 16:49:54 -0800
Subject: [PATCH] Use res-auto as app xml namespace instead of settings.

This is necessary for SettingsIntelligence to parse settings:keywords
when indexing search stuff.

Bug: 64938328
Test: rerun tests
Change-Id: I0d8885c854852020dfa0b9faa3044d4a1b82f8f2
---
 res/xml/account_type_settings.xml                | 2 +-
 res/xml/apn_settings.xml                         | 2 +-
 res/xml/app_and_notification.xml                 | 2 +-
 res/xml/app_default_settings.xml                 | 2 +-
 res/xml/app_list_disclosure_settings.xml         | 2 +-
 res/xml/app_notification_settings.xml            | 2 +-
 res/xml/app_ops_permissions_details.xml          | 2 +-
 res/xml/app_restrictions.xml                     | 2 +-
 res/xml/backup_settings.xml                      | 2 +-
 res/xml/captioning_settings.xml                  | 2 +-
 res/xml/channel_notification_settings.xml        | 2 +-
 res/xml/date_time_prefs.xml                      | 2 +-
 res/xml/development_settings.xml                 | 2 +-
 res/xml/device_info_settings_v2.xml              | 2 +-
 res/xml/device_info_storage.xml                  | 2 +-
 res/xml/device_info_storage_volume.xml           | 2 +-
 res/xml/display_settings.xml                     | 2 +-
 res/xml/encryption_and_credential.xml            | 2 +-
 res/xml/enterprise_privacy_settings.xml          | 2 +-
 res/xml/enterprise_set_default_apps_settings.xml | 2 +-
 res/xml/external_sources_details.xml             | 2 +-
 res/xml/high_power_details.xml                   | 2 +-
 res/xml/language_and_input.xml                   | 2 +-
 res/xml/location_settings.xml                    | 2 +-
 res/xml/managed_profile_settings.xml             | 2 +-
 res/xml/network_and_internet.xml                 | 2 +-
 res/xml/notification_group_settings.xml          | 2 +-
 res/xml/notification_settings.xml                | 2 +-
 res/xml/other_sound_settings.xml                 | 2 +-
 res/xml/power_usage_advanced.xml                 | 2 +-
 res/xml/power_usage_details.xml                  | 2 +-
 res/xml/power_usage_summary.xml                  | 2 +-
 res/xml/print_job_settings.xml                   | 2 +-
 res/xml/print_settings.xml                       | 2 +-
 res/xml/privacy_settings.xml                     | 2 +-
 res/xml/reset_dashboard_fragment.xml             | 2 +-
 res/xml/security_settings.xml                    | 2 +-
 res/xml/security_settings_chooser.xml            | 2 +-
 res/xml/security_settings_lockscreen.xml         | 2 +-
 res/xml/security_settings_lockscreen_profile.xml | 2 +-
 res/xml/security_settings_password.xml           | 2 +-
 res/xml/security_settings_password_profile.xml   | 2 +-
 res/xml/security_settings_pattern.xml            | 2 +-
 res/xml/security_settings_pattern_profile.xml    | 2 +-
 res/xml/security_settings_pin.xml                | 2 +-
 res/xml/security_settings_pin_profile.xml        | 2 +-
 res/xml/security_settings_profile.xml            | 2 +-
 res/xml/security_settings_unification.xml        | 2 +-
 res/xml/sim_lock_settings.xml                    | 2 +-
 res/xml/sound_settings.xml                       | 2 +-
 res/xml/special_access.xml                       | 2 +-
 res/xml/storage_dashboard_fragment.xml           | 2 +-
 res/xml/user_and_accounts_settings.xml           | 2 +-
 res/xml/user_details_settings.xml                | 2 +-
 res/xml/user_settings.xml                        | 2 +-
 res/xml/vpn_app_management.xml                   | 2 +-
 res/xml/wifi_configure_settings.xml              | 2 +-
 res/xml/wifi_settings.xml                        | 2 +-
 res/xml/zen_mode_behavior_settings.xml           | 2 +-
 59 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/res/xml/account_type_settings.xml b/res/xml/account_type_settings.xml
index 31f3f69dfa1..29f92ea2305 100644
--- a/res/xml/account_type_settings.xml
+++ b/res/xml/account_type_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/account_settings_title"
         settings:keywords="@string/keywords_accounts">
 
diff --git a/res/xml/apn_settings.xml b/res/xml/apn_settings.xml
index 86a336c3413..98b45a124ec 100644
--- a/res/xml/apn_settings.xml
+++ b/res/xml/apn_settings.xml
@@ -15,6 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/apn_settings" android:key="apn_list">
 </PreferenceScreen>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 3df469b7082..f08afa86853 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -17,7 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="apps_and_notification_screen"
     android:title="@string/app_and_notification_dashboard_title"
     settings:initialExpandedChildrenCount="4">
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 4d5c9d7c2c0..698ab0c83f2 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -17,7 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="app_default_settings_screen"
     android:title="@string/app_default_dashboard_title">
 
diff --git a/res/xml/app_list_disclosure_settings.xml b/res/xml/app_list_disclosure_settings.xml
index 1daf15de74a..0874407ba2b 100644
--- a/res/xml/app_list_disclosure_settings.xml
+++ b/res/xml/app_list_disclosure_settings.xml
@@ -16,7 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="app_list_disclosure_settings">
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 00a914202eb..b21d168d4b8 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <com.android.settings.applications.LayoutPreference
         android:key="pref_app_header"
diff --git a/res/xml/app_ops_permissions_details.xml b/res/xml/app_ops_permissions_details.xml
index c36f44e917b..743090f1b7a 100644
--- a/res/xml/app_ops_permissions_details.xml
+++ b/res/xml/app_ops_permissions_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreference
         android:key="app_ops_settings_switch" />
diff --git a/res/xml/app_restrictions.xml b/res/xml/app_restrictions.xml
index ddc911de440..3515fc118f4 100644
--- a/res/xml/app_restrictions.xml
+++ b/res/xml/app_restrictions.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/application_restrictions"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <Preference
         android:key="user_info"
diff --git a/res/xml/backup_settings.xml b/res/xml/backup_settings.xml
index 30792bc8a15..523c2dc414e 100644
--- a/res/xml/backup_settings.xml
+++ b/res/xml/backup_settings.xml
@@ -16,7 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/privacy_settings_title">
 
     <!-- Backup settings provided by the backup transport or the default settings -->
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 5ba89cf10b2..312973854c9 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -16,7 +16,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
     android:key="captioning_preference_screen"
     android:title="@string/accessibility_captioning_title" >
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index aaadce4f1a9..fb2705ad333 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
+        xmlns:settings="http://schemas.android.com/apk/res-auto" >
 
     <com.android.settings.applications.LayoutPreference
         android:key="pref_app_header"
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index a26136fdb7e..d74e8c2cb84 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="date_time_settings_screen"
     android:title="@string/date_and_time"
     settings:keywords="@string/keywords_date_and_time">
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 9857280ecf4..2ca1ced5bb5 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="development_prefs_screen"
         android:title="@string/development_settings_title">
 
diff --git a/res/xml/device_info_settings_v2.xml b/res/xml/device_info_settings_v2.xml
index 9a48e96b4be..d5c0c9974f6 100644
--- a/res/xml/device_info_settings_v2.xml
+++ b/res/xml/device_info_settings_v2.xml
@@ -17,7 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="device_info_pref_screen"
     android:title="@string/about_settings"
     settings:initialExpandedChildrenCount="6">
diff --git a/res/xml/device_info_storage.xml b/res/xml/device_info_storage.xml
index 19c5982faae..d5cce393ed6 100644
--- a/res/xml/device_info_storage.xml
+++ b/res/xml/device_info_storage.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/storage_settings"
     settings:keywords="@string/keywords_storage">
 
diff --git a/res/xml/device_info_storage_volume.xml b/res/xml/device_info_storage_volume.xml
index 35435d7cde6..cb02d9a9eae 100644
--- a/res/xml/device_info_storage_volume.xml
+++ b/res/xml/device_info_storage_volume.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/storage_settings"
     settings:keywords="@string/keywords_storage">
 
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a6efb5c1afe..f9f5d2b6d42 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="display_settings_screen"
     android:title="@string/display_settings"
     settings:keywords="@string/keywords_display"
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index 3e3130cdc14..c60c5b5c645 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/encryption_and_credential_settings_title"
     android:key="encryption_and_credentials_screen">
 
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index ffdf630d156..4fa50e7aae5 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="enterprise_privacy_settings"
                   android:title="@string/enterprise_privacy_settings">
 
diff --git a/res/xml/enterprise_set_default_apps_settings.xml b/res/xml/enterprise_set_default_apps_settings.xml
index b006f46cba5..474a5c92767 100644
--- a/res/xml/enterprise_set_default_apps_settings.xml
+++ b/res/xml/enterprise_set_default_apps_settings.xml
@@ -16,7 +16,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="enterprise_set_default_apps_settings">
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
diff --git a/res/xml/external_sources_details.xml b/res/xml/external_sources_details.xml
index 6bc73905c2d..9e79c107a6a 100644
--- a/res/xml/external_sources_details.xml
+++ b/res/xml/external_sources_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/install_other_apps">
 
     <com.android.settingslib.RestrictedSwitchPreference
diff --git a/res/xml/high_power_details.xml b/res/xml/high_power_details.xml
index d0aae549755..6eba78e9982 100644
--- a/res/xml/high_power_details.xml
+++ b/res/xml/high_power_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/high_power_apps">
 
     <SwitchPreference
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 24006c21d80..d5bb29c460f 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -17,7 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="language_and_input_settings_screen"
     android:title="@string/language_settings"
     settings:initialExpandedChildrenCount="3" >
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 77063bda526..96fe9051a43 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="location_settings"
         android:title="@string/location_settings_title"
         settings:keywords="@string/keywords_location">
diff --git a/res/xml/managed_profile_settings.xml b/res/xml/managed_profile_settings.xml
index db3eb41a049..58fcd8802a6 100644
--- a/res/xml/managed_profile_settings.xml
+++ b/res/xml/managed_profile_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/managed_profile_settings_title">
 
     <SwitchPreference
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 6dfd06bdc5e..bc027d3554e 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="network_and_internet_screen"
     android:title="@string/network_dashboard_title">
 
diff --git a/res/xml/notification_group_settings.xml b/res/xml/notification_group_settings.xml
index c1381974467..0d4184def7b 100644
--- a/res/xml/notification_group_settings.xml
+++ b/res/xml/notification_group_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <com.android.settings.applications.LayoutPreference
         android:key="pref_app_header"
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index b2f1d3d5590..85952e9d06a 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -15,6 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
 </PreferenceScreen>
diff --git a/res/xml/other_sound_settings.xml b/res/xml/other_sound_settings.xml
index da67d0378f3..6eca62cd289 100644
--- a/res/xml/other_sound_settings.xml
+++ b/res/xml/other_sound_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/other_sound_settings"
         android:key="other_sound_settings"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <!-- Dial pad tones -->
     <SwitchPreference
diff --git a/res/xml/power_usage_advanced.xml b/res/xml/power_usage_advanced.xml
index 67c785746b6..b31eb403db1 100644
--- a/res/xml/power_usage_advanced.xml
+++ b/res/xml/power_usage_advanced.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="power_usage_advanced_screen"
     android:title="@string/advanced_battery_title"
     settings:keywords="@string/keywords_battery">
diff --git a/res/xml/power_usage_details.xml b/res/xml/power_usage_details.xml
index 86aa4f5787c..85a2ce762ca 100644
--- a/res/xml/power_usage_details.xml
+++ b/res/xml/power_usage_details.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
 
         <com.android.settings.applications.LayoutPreference
             android:key="two_buttons"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 57195f97118..80179c02ac7 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="power_usage_summary_screen"
     android:title="@string/power_usage_summary_title"
     settings:keywords="@string/keywords_battery">
diff --git a/res/xml/print_job_settings.xml b/res/xml/print_job_settings.xml
index 5550478293f..32a80a73d09 100644
--- a/res/xml/print_job_settings.xml
+++ b/res/xml/print_job_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/print_print_job">
 
     <Preference
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
index fe8cac1304d..75a767a96c8 100644
--- a/res/xml/print_settings.xml
+++ b/res/xml/print_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="print_settings_screen"
     android:title="@string/print_settings_title"
     settings:keywords="@string/keywords_printing">
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 715f33be1b1..a25933bf1ed 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/privacy_settings_title">
 
     <!-- Backup settings -->
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index 2761496a3e0..1b8dc6800f2 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -17,7 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/reset_dashboard_title"
     android:key="reset_dashboard_fragment_screen">
 
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index aa4ca9d092f..31f2334d914 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="security_dashboard_page"
     android:title="@string/security_settings_title"
     settings:initialExpandedChildrenCount="9">
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 772057acdb8..360e6200e22 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_chooser_screen"
                   android:title="@string/security_settings_title">
 
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index 0d2e3e82edc..56410fb5baf 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_lockscreen_screen"
                   android:title="@string/security_settings_title">
 
diff --git a/res/xml/security_settings_lockscreen_profile.xml b/res/xml/security_settings_lockscreen_profile.xml
index 34e6653e19f..a0c3f024912 100644
--- a/res/xml/security_settings_lockscreen_profile.xml
+++ b/res/xml/security_settings_lockscreen_profile.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_lockscreen_profile_screen"
                   android:title="@string/security_settings_title">
 
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index e9e3bde85f8..26077c7f508 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_password_screen"
                   android:title="@string/lock_settings_picker_title">
 
diff --git a/res/xml/security_settings_password_profile.xml b/res/xml/security_settings_password_profile.xml
index 3e5701de1e3..257b234c908 100644
--- a/res/xml/security_settings_password_profile.xml
+++ b/res/xml/security_settings_password_profile.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_password_profile_screen"
                   android:title="@string/security_settings_title">
 
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index d55d6b8fc20..9b7482f8e5d 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_pattern_screen"
                   android:title="@string/lock_settings_picker_title">
 
diff --git a/res/xml/security_settings_pattern_profile.xml b/res/xml/security_settings_pattern_profile.xml
index 7387743db29..e095486560a 100644
--- a/res/xml/security_settings_pattern_profile.xml
+++ b/res/xml/security_settings_pattern_profile.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_pattern_profile_screen"
                   android:title="@string/security_settings_title">
 
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index f7705b7e9cd..780ca193fd2 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/lock_settings_picker_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_pin_profile.xml b/res/xml/security_settings_pin_profile.xml
index ae32535cd55..071b2f5a046 100644
--- a/res/xml/security_settings_pin_profile.xml
+++ b/res/xml/security_settings_pin_profile.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="security_settings_pin_profile_screen"
                   android:title="@string/security_settings_title">
 
diff --git a/res/xml/security_settings_profile.xml b/res/xml/security_settings_profile.xml
index 55dd8efe0ca..9870e30799c 100644
--- a/res/xml/security_settings_profile.xml
+++ b/res/xml/security_settings_profile.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/lock_settings_picker_title">
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_unification.xml b/res/xml/security_settings_unification.xml
index 79b8b7d7f42..43b8b09be6c 100644
--- a/res/xml/security_settings_unification.xml
+++ b/res/xml/security_settings_unification.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/security_settings_title">
 
     <SwitchPreference
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 0246ea25a87..2b823f9f35f 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/sim_lock_settings">
 
     <SwitchPreference
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index db88a8fd19a..616a08c93f3 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/sound_settings"
     android:key="sound_settings"
     settings:keywords="@string/keywords_sounds"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index f6617dbc792..6adfc933fb4 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="special_app_access_screen"
         android:title="@string/special_access">
 
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 3ed9c374b81..22d3d4c307b 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="storage_dashboard_screen"
     android:title="@string/storage_settings"
     android:orderingFromXml="false">
diff --git a/res/xml/user_and_accounts_settings.xml b/res/xml/user_and_accounts_settings.xml
index 354d9e9d231..7f82f437c96 100644
--- a/res/xml/user_and_accounts_settings.xml
+++ b/res/xml/user_and_accounts_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="user_and_account_settings_screen"
     android:title="@string/account_dashboard_title"
     settings:keywords="@string/keywords_accounts">
diff --git a/res/xml/user_details_settings.xml b/res/xml/user_details_settings.xml
index 44ec064d151..09154c483d7 100644
--- a/res/xml/user_details_settings.xml
+++ b/res/xml/user_details_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreference
             android:key="enable_calling"
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 7dc3d4e8fa1..cf683442079 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/user_settings_title">
 
     <PreferenceCategory
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index 79f1fc27281..e18a0746795 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
         <Preference
                 android:key="version"
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 322e2a5aaf1..e58d319bbf5 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="wifi_configure_settings_screen"
         android:title="@string/wifi_configure_settings_preference_title">
 
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index a33f77b8484..e391bcd6c51 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/wifi_settings"
         settings:keywords="@string/keywords_wifi">
 
diff --git a/res/xml/zen_mode_behavior_settings.xml b/res/xml/zen_mode_behavior_settings.xml
index 999d6b4b05a..01e874d5531 100644
--- a/res/xml/zen_mode_behavior_settings.xml
+++ b/res/xml/zen_mode_behavior_settings.xml
@@ -17,7 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="zen_mode_behavior_settings_page"
     android:title="@string/zen_mode_behavior_settings_title"
     settings:initialExpandedChildrenCount="7">