Add option to reset network settings to factory

bug:16161518
Change-Id: I7c0cc58d5385352c6c9af2b27af23a744b5df977

1 files changed, 42 insertions, 49 deletions

diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 4760300..4607254 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -15,54 +15,47 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/privacy_settings_title">
-
-    <PreferenceCategory android:key="backup_category"
-            android:title="@string/backup_section_title">
-
-        <!-- Backup settings -->
-        <SwitchPreference
-                android:key="backup_data"
-                android:title="@string/backup_data_title"
-                android:summary="@string/backup_data_summary"
-                android:persistent="false" />
-
-        <PreferenceScreen
-                android:key="configure_account"
-                android:title="@string/backup_configure_account_title"
-                android:summary="@string/backup_configure_account_default_summary"
-                android:persistent="false">
-            <!-- the Intent declared here is always overwritten by a real one -->
-            <intent android:action="dummy" />
-        </PreferenceScreen>
-
-        <SwitchPreference
-                android:key="auto_restore"
-                android:title="@string/auto_restore_title"
-                android:summary="@string/auto_restore_summary"
-                android:persistent="false" />
-
-        <Preference
-                android:key="backup_inactive"
-                android:title="@string/backup_inactive_title"
-                android:summary="@string/backup_inactive_summary"
-                android:persistent="false"
-                android:enabled="false"
-                android:selectable="false" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:key="personal_data_category"
-            android:title="@string/personal_data_section_title">
-
-        <!-- Factory reset -->
-        <PreferenceScreen
-            android:title="@string/master_clear_title"
-            android:summary="@string/master_clear_summary"
-            settings:keywords="@string/keywords_factory_data_reset"
-            android:fragment="com.android.settings.MasterClear" />
-
-    </PreferenceCategory>
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/privacy_settings_title">
+
+    <!-- Backup settings -->
+    <SwitchPreference
+        android:key="backup_data"
+        android:title="@string/backup_data_title"
+        android:summary="@string/backup_data_summary"
+        android:persistent="false" />
+
+    <PreferenceScreen
+        android:key="configure_account"
+        android:title="@string/backup_configure_account_title"
+        android:persistent="false">
+        <!-- the Intent declared here is always overwritten by a real one -->
+        <intent android:action="dummy" />
+    </PreferenceScreen>
+
+    <SwitchPreference
+        android:key="auto_restore"
+        android:title="@string/auto_restore_title"
+        android:summary="@string/auto_restore_summary"
+        android:persistent="false" />
+
+    <Preference
+        android:key="backup_inactive"
+        android:title="@string/backup_inactive_title"
+        android:persistent="false"
+        android:enabled="false"
+        android:selectable="false" />
+
+    <!-- Network reset -->
+    <PreferenceScreen
+        android:title="@string/reset_network_title"
+        android:fragment="com.android.settings.ResetNetwork" />
+
+    <!-- Factory reset -->
+    <PreferenceScreen
+        android:key="factory_reset"
+        android:title="@string/master_clear_title"
+        settings:keywords="@string/keywords_factory_data_reset"
+        android:fragment="com.android.settings.MasterClear" />
 
 </PreferenceScreen>