diff options
author | Stuart Scott <stuartscott@google.com> | 2014-07-24 19:22:06 -0700 |
---|---|---|
committer | Stuart Scott <stuartscott@google.com> | 2015-03-09 13:18:50 -0700 |
commit | be90341c808ac5b17149eb42eac966906c6f2041 (patch) | |
tree | d9e62776c992a5db7e9eb3d76f60fbac69c98a3a /res/xml | |
parent | 792343b2f5b804f941d8dc397d2017cce854f519 (diff) | |
download | packages_apps_Settings-be90341c808ac5b17149eb42eac966906c6f2041.zip packages_apps_Settings-be90341c808ac5b17149eb42eac966906c6f2041.tar.gz packages_apps_Settings-be90341c808ac5b17149eb42eac966906c6f2041.tar.bz2 |
Add option to reset network settings to factory
bug:16161518
Change-Id: I7c0cc58d5385352c6c9af2b27af23a744b5df977
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/privacy_settings.xml | 91 |
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> |