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
2017-11-17 16:49:54 -08:00
parent 264b8b5c08
commit 74c61d1fef
59 changed files with 59 additions and 59 deletions
--- 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">

--- 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>
--- 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">
--- 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">

--- 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"/>
--- 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"
--- 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" />
--- 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"
--- 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 -->
--- 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" >
--- 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"
--- 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">
--- 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">

--- 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">
--- 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">

--- 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">

--- 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"
--- 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">

--- 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">

--- 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"/>
--- 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
--- 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
--- 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" >
--- 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">
--- 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
--- 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">

--- 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"
--- 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>
--- 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
--- 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">
--- 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"
--- 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">
--- 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
--- 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">
--- 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 -->
--- 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">

--- 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">
--- 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">

--- 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">

--- 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">

--- 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">

--- 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">

--- 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">

--- 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">

--- 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
--- 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">

--- 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
--- 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
--- 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
--- 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"
--- 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">

--- 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">
--- 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">
--- 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"
--- 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
--- 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"
--- 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">

--- 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">

--- 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">