diff options
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/application_settings.xml | 7 | ||||
| -rw-r--r-- | res/xml/bluetooth_advanced_settings.xml | 47 | ||||
| -rw-r--r-- | res/xml/bluetooth_settings.xml | 50 | ||||
| -rw-r--r-- | res/xml/display_settings.xml | 22 | ||||
| -rw-r--r-- | res/xml/dream_settings.xml | 41 | ||||
| -rw-r--r-- | res/xml/language_settings.xml | 21 | ||||
| -rw-r--r-- | res/xml/location_settings.xml | 41 | ||||
| -rw-r--r-- | res/xml/security_settings.xml | 29 | ||||
| -rw-r--r-- | res/xml/security_settings_misc.xml | 13 | ||||
| -rw-r--r-- | res/xml/settings_headers.xml | 122 | ||||
| -rw-r--r-- | res/xml/tts_settings.xml | 39 | ||||
| -rw-r--r-- | res/xml/wallpaper_settings.xml | 20 | ||||
| -rw-r--r-- | res/xml/wifi_access_points_for_wifi_setup_xl.xml | 3 | ||||
| -rw-r--r-- | res/xml/wifi_advanced_settings.xml | 16 | ||||
| -rw-r--r-- | res/xml/wifi_settings.xml | 34 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 45 |
16 files changed, 311 insertions, 239 deletions
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml index 4e77a93..3ad1e5d 100644 --- a/res/xml/application_settings.xml +++ b/res/xml/application_settings.xml @@ -54,6 +54,13 @@ android:summaryOn="@string/install_unknown_applications" android:persistent="false" /> + <CheckBoxPreference + android:key="toggle_advanced_settings" + android:title="@string/advanced_settings" + android:summaryOff="@string/advanced_settings_summary" + android:summaryOn="@string/advanced_settings_summary" + android:persistent="false" /> + <ListPreference android:key="app_install_location" android:title="@string/app_install_location_title" diff --git a/res/xml/bluetooth_advanced_settings.xml b/res/xml/bluetooth_advanced_settings.xml new file mode 100644 index 0000000..345b3bf --- /dev/null +++ b/res/xml/bluetooth_advanced_settings.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/bluetooth_advanced_titlebar"> + + <com.android.settings.bluetooth.BluetoothNamePreference + android:key="bt_name" + android:title="@string/bluetooth_device_name" + android:summary="@string/bluetooth_name_not_set" + android:dialogTitle="@string/bluetooth_device_name" + android:persistent="false" + android:singleLine="true" /> + + <CheckBoxPreference + android:key="bt_discoverable" + android:title="@string/bluetooth_visibility" + android:summaryOn="@string/bluetooth_is_discoverable" + android:summaryOff="@string/bluetooth_not_discoverable" + android:persistent="false" /> + + <ListPreference + android:key="bt_discoverable_timeout" + android:title="@string/bluetooth_visibility_timeout" + android:summary="@string/bluetooth_visibility_timeout_summary" + android:entries="@array/bluetooth_visibility_timeout_entries" + android:entryValues="@array/bluetooth_visibility_timeout_values" /> + + <Preference + android:key="bt_show_received_files" + android:title="@string/bluetooth_show_received_files_title" + android:summary="@string/bluetooth_show_received_files_summary" /> + +</PreferenceScreen> diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml index 042eed5..783a860 100644 --- a/res/xml/bluetooth_settings.xml +++ b/res/xml/bluetooth_settings.xml @@ -18,54 +18,4 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/bluetooth_settings" > - <PreferenceCategory - android:title="@string/bluetooth_preference_device_settings"/> - - <CheckBoxPreference - android:key="bt_checkbox" - android:title="@string/bluetooth" - android:summary="@string/bluetooth_quick_toggle_summary" /> - - <com.android.settings.bluetooth.BluetoothNamePreference - android:key="bt_name" - android:title="@string/bluetooth_device_name" - android:summary="@string/bluetooth_name_not_set" - android:dialogTitle="@string/bluetooth_device_name" - android:dependency="bt_checkbox" - android:persistent="false" - android:singleLine="true" /> - - <CheckBoxPreference - android:key="bt_discoverable" - android:title="@string/bluetooth_visibility" - android:dependency="bt_checkbox" - android:summaryOn="@string/bluetooth_is_discoverable" - android:summaryOff="@string/bluetooth_not_discoverable" - android:persistent="false" /> - - <ListPreference - android:key="bt_discoverable_timeout" - android:title="@string/bluetooth_visibility_timeout" - android:dependency="bt_discoverable" - android:summary="@string/bluetooth_visibility_timeout_summary" - android:entries="@array/bluetooth_visibility_timeout_entries" - android:entryValues="@array/bluetooth_visibility_timeout_values" /> - - <Preference - android:key="bt_show_received_files" - android:dependency="bt_checkbox" - android:title="@string/bluetooth_show_received_files_title" - android:summary="@string/bluetooth_show_received_files_summary" /> - - <PreferenceCategory - android:key="bt_device_list" - android:title="@string/bluetooth_preference_paired_devices" - android:orderingFromXml="false" /> - - <Preference - android:key="bt_find_nearby" - android:dependency="bt_checkbox" - android:fragment="com.android.settings.bluetooth.BluetoothFindNearby" - android:title="@string/bluetooth_preference_find_nearby_title" /> - </PreferenceScreen> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 7fe7f76..b0abd9a 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -41,4 +41,26 @@ android:persistent="false" android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> + + <PreferenceScreen + android:key="wallpaper" + android:title="@string/wallpaper_settings_title" + android:fragment="com.android.settings.WallpaperTypeSettings" + /> + + <PreferenceScreen + android:title="@string/dream_settings_title" + android:summary="@string/dream_settings_summary" + android:fragment="com.android.settings.DreamSettings" + > + </PreferenceScreen> + + <ListPreference + android:key="font_size" + android:title="@string/title_font_size" + android:summary="@string/summary_font_size" + android:entries="@array/entries_font_size" + android:entryValues="@array/entryvalues_font_size" + android:dialogTitle="@string/dialog_title_font_size" /> + </PreferenceScreen> diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml new file mode 100644 index 0000000..1fbb3e9 --- /dev/null +++ b/res/xml/dream_settings.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/dream_settings_title" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + + <com.android.settings.DreamComponentPreference + android:key="dream_component" + android:title="@string/dream_component_title" + android:persistent="false" + /> + + <ListPreference + android:key="dream_timeout" + android:title="@string/dream_timeout_title" + android:summary="@string/dream_timeout_summary" + android:persistent="false" + android:entries="@array/dream_timeout_entries" + android:entryValues="@array/dream_timeout_values" /> + + <com.android.settings.DreamTesterPreference + android:key="dream_test" + android:title="@string/dream_test" + android:persistent="false" + /> + +</PreferenceScreen> diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index 37d4661..1b5f039 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -19,19 +19,18 @@ android:title="@string/language_keyboard_settings_title"> <PreferenceCategory android:key="language_settings_category" - android:title="@string/language_settings_category" /> + android:title="@string/language_settings_category"> - <PreferenceScreen - android:fragment="com.android.settings.LocalePicker" - android:key="phone_language" - android:title="@string/phone_language"> - </PreferenceScreen> + <PreferenceScreen + android:fragment="com.android.settings.LocalePicker" + android:key="phone_language" + android:title="@string/phone_language"/> - <PreferenceScreen - android:fragment="com.android.settings.UserDictionarySettings" - android:title="@string/user_dict_settings_title" - android:summary="@string/user_dict_settings_summary"> - </PreferenceScreen> + <!-- User dictionary preference title and fragment will be set programmatically. --> + <PreferenceScreen + android:key="key_user_dictionary_settings" /> + + </PreferenceCategory> <PreferenceCategory android:key="voice_input_category" android:title="@string/voice_input_category" > diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml new file mode 100644 index 0000000..94133d0 --- /dev/null +++ b/res/xml/location_settings.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/location_settings_title"> + + <CheckBoxPreference + android:key="location_network" + android:title="@string/location_network_based" + android:summaryOn="@string/location_neighborhood_level" + android:summaryOff="@string/location_networks_disabled"/> + + <CheckBoxPreference + android:key="location_gps" + android:title="@string/location_gps" + android:summaryOn="@string/location_street_level" + android:summaryOff="@string/location_gps_disabled"/> + +<!-- Disabled to avoid confusion on devices with no AGPS + For Google experience devices we want AGPS on by default (if supported) so we don't really need this. + <CheckBoxPreference + android:key="assisted_gps" + android:title="@string/assisted_gps" + android:summaryOn="@string/assisted_gps_enabled" + android:summaryOff="@string/assisted_gps_disabled"/> +--> + +</PreferenceScreen> diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml index d0e200a..228b7f1 100644 --- a/res/xml/security_settings.xml +++ b/res/xml/security_settings.xml @@ -15,33 +15,6 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/location_security_settings_title"> - - <PreferenceCategory - android:key="location_category" - android:title="@string/location_title"> - - <CheckBoxPreference - android:key="location_network" - android:title="@string/location_network_based" - android:summaryOn="@string/location_neighborhood_level" - android:summaryOff="@string/location_networks_disabled"/> - - <CheckBoxPreference - android:key="location_gps" - android:title="@string/location_gps" - android:summaryOn="@string/location_street_level" - android:summaryOff="@string/location_gps_disabled"/> - -<!-- Disabled to avoid confusion on devices with no AGPS - For Google experience devices we want AGPS on by default (if supported) so we don't really need this. - <CheckBoxPreference - android:key="assisted_gps" - android:title="@string/assisted_gps" - android:summaryOn="@string/assisted_gps_enabled" - android:summaryOff="@string/assisted_gps_disabled"/> ---> - - </PreferenceCategory> + android:title="@string/security_settings_title"> </PreferenceScreen> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index 68ee8c0..95b2aca 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -47,11 +47,6 @@ <PreferenceCategory android:title="@string/credentials_title" android:persistent="false"> - <CheckBoxPreference android:key="enable_credentials" - android:title="@string/credentials_access" - android:summary="@string/credentials_access_summary" - android:persistent="false"/> - <Preference android:title="@string/credentials_install" android:summary="@string/credentials_install_summary" android:persistent="false"> @@ -60,14 +55,6 @@ android:targetClass="com.android.certinstaller.CertInstallerMain"/> </Preference> - <Preference android:title="@string/credentials_set_password" - android:summary="@string/credentials_set_password_summary" - android:persistent="false"> - <intent android:action="com.android.credentials.SET_PASSWORD" - android:targetPackage="com.android.settings" - android:targetClass="com.android.settings.CredentialStorage"/> - </Preference> - <Preference android:key="reset_credentials" android:title="@string/credentials_reset" android:summary="@string/credentials_reset_summary" diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 5411308..063d103 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -17,32 +17,32 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Operator hook --> - - <header - android:fragment="com.android.settings.WirelessSettings" - android:id="@+id/operator_settings"> - <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" /> - </header> - <!-- Manufacturer hook --> + <!-- WIRELESS and NETWORKS --> + <header android:title="@string/header_category_wireless_networks" /> + <!-- Wifi --> <header - android:fragment="com.android.settings.WirelessSettings" - android:id="@+id/manufacturer_settings"> - <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" /> - </header> + android:id="@+id/wifi_settings" + android:fragment="com.android.settings.wifi.WifiSettings" + android:title="@string/wifi_settings_title" + android:icon="@drawable/ic_settings_wireless" /> - <!-- Wireless controls --> + <!-- Bluetooth --> + <header + android:id="@+id/bluetooth_settings" + android:fragment="com.android.settings.bluetooth.BluetoothSettings" + android:title="@string/bluetooth_settings_title" + android:icon="@drawable/ic_settings_bluetooth2" /> + <!-- Data Usage --> <header - android:id="@+id/wireless_settings" - android:title="@string/radio_controls_title" - android:fragment="com.android.settings.WirelessSettings" - android:icon="@drawable/ic_settings_wireless" /> + android:id="@+id/data_usage_settings" + android:fragment="com.android.settings.DataUsageSummary" + android:title="@string/data_usage_summary_title" + android:icon="@drawable/ic_settings_data_usage" /> <!-- Call settings - this is in the phone process --> - <header android:id="@+id/call_settings" android:icon="@drawable/ic_settings_call" @@ -53,8 +53,25 @@ android:targetClass="com.android.phone.CallFeaturesSetting" /> </header> - <!-- Sound --> + <!-- Operator hook --> + <header + android:fragment="com.android.settings.WirelessSettings" + android:id="@+id/operator_settings"> + <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" /> + </header> + <!-- Other wireless and network controls --> + <header + android:id="@+id/wireless_settings" + android:title="@string/radio_controls_title" + android:fragment="com.android.settings.WirelessSettings" + android:icon="@drawable/ic_settings_more_wireless" /> + + + <!-- DEVICE --> + <header android:title="@string/header_category_device" /> + + <!-- Sound --> <header android:id="@+id/sound_settings" android:icon="@drawable/ic_settings_sound" @@ -62,73 +79,79 @@ android:title="@string/sound_settings_title" /> <!-- Display --> - <header android:id="@+id/display_settings" android:icon="@drawable/ic_settings_display" android:fragment="com.android.settings.DisplaySettings" android:title="@string/display_settings_title" /> - <!-- Security & Location --> - + <!-- Storage --> <header - android:fragment="com.android.settings.SecuritySettings" - android:icon="@drawable/ic_settings_security" - android:title="@string/security_settings_title" - android:id="@+id/security_settings" /> + android:id="@+id/storage_settings" + android:fragment="com.android.settings.deviceinfo.Memory" + android:icon="@drawable/ic_settings_storage" + android:title="@string/storage_settings" /> <!-- Application Settings --> - <header android:fragment="com.android.settings.ApplicationSettings" android:icon="@drawable/ic_settings_applications" android:title="@string/applications_settings" android:id="@+id/application_settings" /> + <!-- Manufacturer hook --> + <header + android:fragment="com.android.settings.WirelessSettings" + android:id="@+id/manufacturer_settings"> + <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" /> + </header> + + + <!-- PERSONAL --> + <header android:title="@string/header_category_personal" /> + <!-- Data Sync. The settings activity will ensure this is resolved to an activity on the system image, otherwise it will remove this preference. --> - <header android:fragment="com.android.settings.accounts.ManageAccountsSettings" android:icon="@drawable/ic_settings_sync" android:title="@string/sync_settings" android:id="@+id/sync_settings" /> - <!-- Privacy --> + <!-- Location --> + <header + android:fragment="com.android.settings.LocationSettings" + android:icon="@drawable/ic_settings_location" + android:title="@string/location_settings_title" + android:id="@+id/location_settings" /> + <!-- Security --> + <header + android:fragment="com.android.settings.SecuritySettings" + android:icon="@drawable/ic_settings_security" + android:title="@string/security_settings_title" + android:id="@+id/security_settings" /> + + <!-- Privacy --> <header android:fragment="com.android.settings.PrivacySettings" android:icon="@drawable/ic_settings_privacy" android:title="@string/privacy_settings" android:id="@+id/privacy_settings" /> - <!-- Storage --> - - <header - android:id="@+id/storage_settings" - android:fragment="com.android.settings.deviceinfo.Memory" - android:icon="@drawable/ic_settings_storage" - android:title="@string/storage_settings" /> - <!-- Language --> - <header android:id="@+id/language_settings" android:fragment="com.android.settings.inputmethod.InputMethodAndLanguageSettings" android:icon="@drawable/ic_settings_language" android:title="@string/language_settings" /> - <!-- Accessibility feedback --> - <header - android:id="@+id/accessibility_settings" - android:fragment="com.android.settings.AccessibilitySettings" - android:icon="@drawable/ic_settings_accessibility" - android:title="@string/accessibility_settings" /> + <!-- SYSTEM --> + <header android:title="@string/header_category_system" /> <!-- Dock --> - <header android:id="@+id/dock_settings" android:fragment="com.android.settings.DockSettings" @@ -136,15 +159,20 @@ android:title="@string/dock_settings" /> <!-- Date & Time --> - <header android:id="@+id/date_time_settings" android:fragment="com.android.settings.DateTimeSettings" android:icon="@drawable/ic_settings_date_time" android:title="@string/date_and_time_settings_title" /> - <!-- About Device --> + <!-- Accessibility feedback --> + <header + android:id="@+id/accessibility_settings" + android:fragment="com.android.settings.AccessibilitySettings" + android:icon="@drawable/ic_settings_accessibility" + android:title="@string/accessibility_settings" /> + <!-- About Device --> <header android:id="@+id/about_settings" android:fragment="com.android.settings.DeviceInfoSettings" diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml index c378f64..ecccc10 100644 --- a/res/xml/tts_settings.xml +++ b/res/xml/tts_settings.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,17 +18,11 @@ android:title="@string/tts_settings_title"> <Preference - android:key="tts_play_example" - android:persistent="false" - android:title="@string/tts_play_example_title" - android:summary="@string/tts_play_example_summary" /> + android:key="tts_play_example" + android:persistent="false" + android:title="@string/tts_play_example_title" + android:summary="@string/tts_play_example_summary" /> - <CheckBoxPreference - android:key="toggle_use_default_tts_settings" - android:title="@string/use_default_tts_settings_title" - android:summary="@string/use_default_tts_settings_summary" - android:persistent="false" /> - <PreferenceCategory android:title="@string/tts_default_settings_section"> <ListPreference @@ -39,12 +33,6 @@ android:entries="@array/tts_engine_entries" android:entryValues="@array/tts_engine_values" /> - <Preference - android:key="tts_install_data" - android:persistent="false" - android:title="@string/tts_install_data_title" - android:summary="@string/tts_install_data_summary" /> - <ListPreference android:key="tts_default_rate" android:title="@string/tts_default_rate_title" @@ -63,8 +51,19 @@ </PreferenceCategory> - <PreferenceCategory android:key="tts_engines_section" - android:title="@string/tts_engines_section" /> + <PreferenceCategory android:key="tts_engine_settings_section" + android:title="@string/tts_engine_settings_section"> + <Preference + android:key="tts_engine_settings" + android:persistent="false" + android:title="@string/tts_engine_settings_title" /> + + <Preference + android:key="tts_install_data" + android:persistent="false" + android:title="@string/tts_install_data_title" + android:summary="@string/tts_install_data_summary" /> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/wallpaper_settings.xml b/res/xml/wallpaper_settings.xml new file mode 100644 index 0000000..63346f7 --- /dev/null +++ b/res/xml/wallpaper_settings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/wallpaper_settings_title"> + +</PreferenceScreen> diff --git a/res/xml/wifi_access_points_for_wifi_setup_xl.xml b/res/xml/wifi_access_points_for_wifi_setup_xl.xml index 013c62c..14266f5 100644 --- a/res/xml/wifi_access_points_for_wifi_setup_xl.xml +++ b/res/xml/wifi_access_points_for_wifi_setup_xl.xml @@ -15,7 +15,4 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <com.android.settings.wifi.AccessPointCategoryForSetupWizardXL - android:key="access_points" - android:persistent="false" /> </PreferenceScreen> diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml index 4d85178..1444de1 100644 --- a/res/xml/wifi_advanced_settings.xml +++ b/res/xml/wifi_advanced_settings.xml @@ -17,6 +17,22 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/wifi_advanced_titlebar"> + <!-- android:dependency="enable_wifi" --> + <CheckBoxPreference + android:key="notify_open_networks" + android:title="@string/wifi_notify_open_networks" + android:summary="@string/wifi_notify_open_networks_summary" + android:persistent="false" /> + + <ListPreference + android:key="sleep_policy" + android:title="@string/wifi_setting_sleep_policy_title" + android:summary="@string/wifi_setting_sleep_policy_summary" + android:persistent="false" + android:entries="@array/wifi_sleep_policy_entries" + android:entryValues="@array/wifi_sleep_policy_values" + /> + <ListPreference android:key="frequency_band" android:title="@string/wifi_setting_frequency_band_title" diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml index 24f4432..d984d8f 100644 --- a/res/xml/wifi_settings.xml +++ b/res/xml/wifi_settings.xml @@ -17,38 +17,4 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/wifi_settings_category"> - <CheckBoxPreference - android:key="enable_wifi" - android:title="@string/wifi_quick_toggle_title" - android:summary="@string/wifi_quick_toggle_summary" - android:persistent="false" /> - - <CheckBoxPreference - android:key="notify_open_networks" - android:dependency="enable_wifi" - android:title="@string/wifi_notify_open_networks" - android:summary="@string/wifi_notify_open_networks_summary" - android:persistent="false" /> - - <ListPreference - android:key="sleep_policy" - android:title="@string/wifi_setting_sleep_policy_title" - android:summary="@string/wifi_setting_sleep_policy_summary" - android:persistent="false" - android:entries="@array/wifi_sleep_policy_entries" - android:entryValues="@array/wifi_sleep_policy_values" - /> - - <com.android.settings.ProgressCategory - android:key="access_points" - android:dependency="enable_wifi" - android:title="@string/wifi_access_points" - android:persistent="false" /> - - <Preference - android:key="add_network" - android:dependency="enable_wifi" - android:title="@string/wifi_add_network" - android:persistent="false" /> - </PreferenceScreen> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 466df7b..f3de7ec 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -17,6 +17,9 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/wireless_networks_settings_title"> + <PreferenceCategory + android:title="@string/wireless_category_general" /> + <CheckBoxPreference android:key="toggle_airplane" android:title="@string/airplane_mode" @@ -24,31 +27,17 @@ android:persistent="false" android:disableDependentsState="true" /> - <!-- Programmatically will have dynamic summary, but we provide the fallback summary. --> - <CheckBoxPreference - android:key="toggle_wifi" - android:title="@string/wifi_quick_toggle_title" - android:summary="@string/wifi_quick_toggle_summary" - android:persistent="false" /> - - <PreferenceScreen - android:fragment="com.android.settings.wifi.WifiSettings" - android:key="wifi_settings" - android:title="@string/wifi_settings" - android:summary="@string/wifi_settings_summary" > - </PreferenceScreen> - <CheckBoxPreference - android:key="toggle_bluetooth" - android:title="@string/bluetooth_quick_toggle_title" - android:summary="@string/bluetooth_quick_toggle_summary" + android:key="toggle_nfc" + android:title="@string/nfc_quick_toggle_title" + android:summary="@string/nfc_quick_toggle_summary" android:persistent="false" /> <PreferenceScreen - android:fragment="com.android.settings.bluetooth.BluetoothSettings" - android:key="bt_settings" - android:title="@string/bluetooth_settings_title" - android:summary="@string/bluetooth_settings_summary"> + android:fragment="com.android.settings.vpn.VpnSettings" + android:key="vpn_settings" + android:title="@string/vpn_settings_title" + android:summary="@string/vpn_settings_summary" > </PreferenceScreen> <PreferenceScreen @@ -58,18 +47,8 @@ android:summary="@string/tether_settings_summary_all"> </PreferenceScreen> - <PreferenceScreen - android:fragment="com.android.settings.vpn.VpnSettings" - android:key="vpn_settings" - android:title="@string/vpn_settings_title" - android:summary="@string/vpn_settings_summary" > - </PreferenceScreen> - - <CheckBoxPreference - android:key="toggle_nfc" - android:title="@string/nfc_quick_toggle_title" - android:summary="@string/nfc_quick_toggle_summary" - android:persistent="false" /> + <PreferenceCategory + android:title="@string/wireless_category_mobile_networks" /> <PreferenceScreen android:key="mobile_network_settings" |