diff options
Diffstat (limited to 'res/xml')
22 files changed, 479 insertions, 378 deletions
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 771b69e..90aef84 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -19,20 +19,23 @@ android:title="@string/accessibility_settings_title"> <CheckBoxPreference - android:key="toggle_accessibility_service_checkbox" - android:title="@string/toggle_accessibility_title" + android:key="toggle_large_text_checkbox" + android:title="@string/toggle_large_text_title" android:persistent="false"/> <PreferenceCategory android:key="accessibility_services_category" - android:title="@string/accessibility_services_category" /> - - <PreferenceCategory android:key="accessibility_script_injection_category" - android:title="@string/accessibility_script_injection_category"> + android:title="@string/accessibility_services_category"> + <CheckBoxPreference + android:key="toggle_accessibility_service_checkbox" + android:title="@string/toggle_accessibility_title" + android:persistent="false" + android:order="-10000"/> <CheckBoxPreference android:key="toggle_accessibility_script_injection_checkbox" android:title="@string/accessibility_script_injection_enabled" android:summary="@string/accessibility_script_injection_enabled_summary" - android:persistent="false" /> + android:persistent="false" + android:order="10000" /> </PreferenceCategory> <PreferenceCategory android:key="power_button_category" diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml index 4e77a93..3329662 100644 --- a/res/xml/application_settings.xml +++ b/res/xml/application_settings.xml @@ -14,6 +14,13 @@ limitations under the License. --> +<!-- + + This code is deprecated. This screen is no longer used in Settings. + The ApplicationSettings class is kept in case an external app references it directly. + +--> + <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/applications_settings_header" android:summary="@string/applications_settings_summary" @@ -40,18 +47,11 @@ android:value="com.android.settings.Settings$StorageUseActivity" /> </PreferenceScreen> - <PreferenceScreen - android:key="power_usage" - android:fragment="com.android.settings.fuelgauge.PowerUsageSummary" - android:title="@string/power_usage_summary_title" - android:summary="@string/power_usage_summary"> - </PreferenceScreen> - <CheckBoxPreference - android:key="toggle_install_applications" - android:title="@string/install_applications" - android:summaryOff="@string/install_unknown_applications" - android:summaryOn="@string/install_unknown_applications" + 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 @@ -73,12 +73,5 @@ </PreferenceScreen> --> - - <PreferenceScreen - android:title="@string/development_settings_title" - android:summary="@string/development_settings_summary" - android:fragment="com.android.settings.DevelopmentSettings"> - </PreferenceScreen> - </PreferenceScreen> 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/development_prefs.xml b/res/xml/development_prefs.xml index 292206a..a73e7d1 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -38,4 +38,61 @@ android:dialogTitle="@string/hdcp_checking_dialog_title" android:entries="@array/hdcp_checking_titles" android:entryValues="@array/hdcp_checking_values" /> + + <PreferenceCategory android:key="debug_ui_category" + android:title="@string/debug_ui_category"> + + <CheckBoxPreference + android:key="strict_mode" + android:title="@string/strict_mode" + android:summary="@string/strict_mode_summary"/> + + <CheckBoxPreference + android:key="pointer_location" + android:title="@string/pointer_location" + android:summary="@string/pointer_location_summary"/> + + <CheckBoxPreference + android:key="show_screen_updates" + android:title="@string/show_screen_updates" + android:summary="@string/show_screen_updates_summary"/> + + <CheckBoxPreference + android:key="show_cpu_usage" + android:title="@string/show_cpu_usage" + android:summary="@string/show_cpu_usage_summary"/> + + <ListPreference + android:key="window_animation_scale" + android:title="@string/window_animation_scale_title" + android:persistent="false" + android:entries="@array/window_animation_scale_entries" + android:entryValues="@array/window_animation_scale_values" /> + + <ListPreference + android:key="transition_animation_scale" + android:title="@string/transition_animation_scale_title" + android:persistent="false" + android:entries="@array/transition_animation_scale_entries" + android:entryValues="@array/transition_animation_scale_values" /> + + </PreferenceCategory> + + <PreferenceCategory android:key="debug_applications_category" + android:title="@string/debug_applications_category"> + + <CheckBoxPreference + android:key="immediately_destroy_activities" + android:title="@string/immediately_destroy_activities" + android:summary="@string/immediately_destroy_activities_summary"/> + + <ListPreference + android:key="app_process_limit" + android:title="@string/app_process_limit_title" + android:persistent="false" + android:entries="@array/app_process_limit_entries" + android:entryValues="@array/app_process_limit_values" /> + + </PreferenceCategory> + </PreferenceScreen> diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index ea79fe0..4dfc718 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_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. @@ -19,32 +19,25 @@ <!-- System update settings - launches activity --> <PreferenceScreen android:key="system_update_settings" - android:title="@string/system_update_settings_list_item_title" + android:title="@string/system_update_settings_list_item_title" android:summary="@string/system_update_settings_list_item_summary"> <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" /> </PreferenceScreen> <!-- Device status - launches activity --> <PreferenceScreen android:key="status_info" - android:title="@string/device_status" + android:title="@string/device_status" android:summary="@string/device_status_summary"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.deviceinfo.Status" /> </PreferenceScreen> - <PreferenceScreen - android:key="power_usage" - android:fragment="com.android.settings.fuelgauge.PowerUsageSummary" - android:title="@string/power_usage_summary_title" - android:summary="@string/power_usage_summary"> - </PreferenceScreen> - <!-- Legal Information --> <PreferenceScreen android:key="container" android:title="@string/legal_information"> - + <!-- Note: The titles given here probably won't be used. Instead, we programmatically fill the title with the label of the activity with the corresponding action. If there is not an activity for an action, the item will be removed from the @@ -72,7 +65,7 @@ </PreferenceScreen> </PreferenceScreen> - + <PreferenceScreen android:key="safetylegal" android:title="@string/settings_safetylegal_title"> @@ -80,7 +73,7 @@ </PreferenceScreen> <!-- Contributors --> - <!-- + <!-- <PreferenceScreen android:key="contributors" android:title="@string/contributors_title"> @@ -89,43 +82,37 @@ --> <!-- System Tutorial - launches activity --> <PreferenceScreen android:key="system_tutorial" - android:title="@string/system_tutorial_list_item_title" + android:title="@string/system_tutorial_list_item_title" android:summary="@string/system_tutorial_list_item_summary"> <intent android:action="android.intent.action.SYSTEM_TUTORIAL" /> </PreferenceScreen> - + <!-- Device hardware model --> - <Preference android:key="device_model" + <Preference android:key="device_model" style="?android:preferenceInformationStyle" android:title="@string/model_number" android:summary="@string/device_info_default"/> - + <!-- Device firmware version --> - <Preference android:key="firmware_version" + <Preference android:key="firmware_version" style="?android:preferenceInformationStyle" android:title="@string/firmware_version" android:summary="@string/device_info_default"/> - - <!-- Device FCC equipment id --> - <Preference android:key="fcc_equipment_id" - style="?android:preferenceInformationStyle" - android:title="@string/fcc_equipment_id" - android:summary="@string/device_info_default"/> - + <!-- Device Baseband version --> - <Preference android:key="baseband_version" + <Preference android:key="baseband_version" style="?android:preferenceInformationStyle" android:title="@string/baseband_version" android:summary="@string/device_info_default"/> - + <!-- Device Kernel version --> - <Preference android:key="kernel_version" + <Preference android:key="kernel_version" style="?android:preferenceInformationStyle" android:title="@string/kernel_version" android:summary="@string/device_info_default"/> <!-- Detailed build version --> - <Preference android:key="build_number" + <Preference android:key="build_number" style="?android:preferenceInformationStyle" android:title="@string/build_number" android:summary="@string/device_info_default"/> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 7fe7f76..c13a107 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -23,22 +23,34 @@ android:title="@string/brightness" android:dialogTitle="@string/brightness" /> + <PreferenceScreen + android:key="wallpaper" + android:title="@string/wallpaper_settings_title" + android:fragment="com.android.settings.WallpaperTypeSettings" /> + <CheckBoxPreference android:key="accelerometer" android:title="@string/accelerometer_title"/> <ListPreference - android:key="animations" - android:title="@string/animations_title" - android:persistent="false" - android:entries="@array/animations_entries" - android:entryValues="@array/animations_values" /> - - <ListPreference android:key="screen_timeout" android:title="@string/screen_timeout" android:summary="@string/screen_timeout_summary" android:persistent="false" android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> + + <PreferenceScreen + android:title="@string/dream_settings_title" + android:summary="@string/dream_settings_summary" + android:fragment="com.android.settings.DreamSettings" /> + + <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..fdf87fc 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -19,19 +19,47 @@ 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="keyboard_settings_category" + android:title="@string/keyboard_settings_category"> + <PreferenceScreen android:key="current_input_method" + android:title="@string/current_input_method" /> + </PreferenceCategory> + <PreferenceCategory + android:key="hard_keyboard" + android:title="@string/builtin_keyboard_settings_title" + android:persistent="false"> + <CheckBoxPreference + android:key="auto_replace" + android:title="@string/auto_replace" + android:summaryOn="@string/auto_replace_summary" + android:summaryOff="@string/auto_replace_summary" + android:persistent="false"/> + <CheckBoxPreference + android:key="auto_caps" + android:title="@string/auto_caps" + android:summaryOn="@string/auto_caps_summary" + android:summaryOff="@string/auto_caps_summary" + android:persistent="false"/> + <CheckBoxPreference + android:key="auto_punctuate" + android:title="@string/auto_punctuate" + android:summaryOn="@string/auto_punctuate_summary" + android:summaryOff="@string/auto_punctuate_summary" + android:persistent="false"/> + </PreferenceCategory> <PreferenceCategory android:key="voice_input_category" android:title="@string/voice_input_category" > @@ -55,24 +83,6 @@ android:title="@string/tts_settings_title" /> </PreferenceCategory> - <PreferenceCategory android:key="keyboard_settings_category" - android:title="@string/keyboard_settings_category"> - <PreferenceScreen android:key="current_input_method" - android:title="@string/current_input_method" /> - - <ListPreference android:key="input_method_selector" - android:title="@string/input_method_selector" - android:persistent="true" - android:entryValues="@array/input_method_selector_values" - android:entries="@array/input_method_selector_titles" - android:defaultValue="@string/input_method_selector_visibility_default_value"/> - - <PreferenceScreen android:key="configure_input_method" - android:title="@string/configure_input_method"> - <intent android:action="android.settings.INPUT_METHOD_SETTINGS"/> - </PreferenceScreen> - </PreferenceCategory> - <PreferenceCategory android:key="pointer_settings_category" android:title="@string/pointer_settings_category"> <com.android.settings.PointerSpeedPreference 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..9f78820 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -39,18 +39,27 @@ <PreferenceCategory android:title="@string/device_admin_title" android:persistent="false"> + <Preference android:title="@string/manage_device_admin" android:summary="@string/manage_device_admin_summary" android:persistent="false" android:fragment="com.android.settings.DeviceAdminSettings"/> + + <CheckBoxPreference + android:key="toggle_install_applications" + android:title="@string/install_applications" + android:summaryOff="@string/install_unknown_applications" + android:summaryOn="@string/install_unknown_applications" + android:persistent="false" /> + </PreferenceCategory> <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/trusted_credentials" + android:summary="@string/trusted_credentials_summary" + android:persistent="false" + android:fragment="com.android.settings.TrustedCredentialsSettings"/> <Preference android:title="@string/credentials_install" android:summary="@string/credentials_install_summary" @@ -60,14 +69,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..cd6191f 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -17,44 +17,51 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- Operator hook --> + <!-- WIRELESS and NETWORKS --> + <header android:title="@string/header_category_wireless_networks" /> + + <!-- Wifi --> <header - android:fragment="com.android.settings.WirelessSettings" - android:id="@+id/operator_settings"> - <intent android:action="com.android.settings.OPERATOR_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" /> - <!-- Manufacturer hook --> + <!-- 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/data_usage_settings" + android:fragment="com.android.settings.DataUsageSummary" + android:title="@string/data_usage_summary_title" + android:icon="@drawable/ic_settings_data_usage" /> + + <!-- Operator hook --> <header android:fragment="com.android.settings.WirelessSettings" - android:id="@+id/manufacturer_settings"> - <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" /> + android:id="@+id/operator_settings"> + <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" /> </header> - <!-- Wireless controls --> - + <!-- Other wireless and network controls --> <header android:id="@+id/wireless_settings" android:title="@string/radio_controls_title" + android:breadCrumbTitle="@string/wireless_networks_settings_title" android:fragment="com.android.settings.WirelessSettings" - android:icon="@drawable/ic_settings_wireless" /> + android:icon="@drawable/ic_settings_more_wireless" /> - <!-- Call settings - this is in the phone process --> - <header - android:id="@+id/call_settings" - android:icon="@drawable/ic_settings_call" - android:title="@string/call_settings_title"> - <intent - android:action="android.intent.action.MAIN" - android:targetPackage="com.android.phone" - android:targetClass="com.android.phone.CallFeaturesSetting" /> - </header> + <!-- DEVICE --> + <header android:title="@string/header_category_device" /> <!-- Sound --> - <header android:id="@+id/sound_settings" android:icon="@drawable/ic_settings_sound" @@ -62,73 +69,86 @@ 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:id="@+id/storage_settings" + android:fragment="com.android.settings.deviceinfo.Memory" + android:icon="@drawable/ic_settings_storage" + android:title="@string/storage_settings" /> + <!-- Battery --> <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/battery_settings" + android:fragment="com.android.settings.fuelgauge.PowerUsageSummary" + android:icon="@drawable/ic_settings_battery" + android:title="@string/power_usage_summary_title" /> <!-- Application Settings --> - <header - android:fragment="com.android.settings.ApplicationSettings" + android:fragment="com.android.settings.applications.ManageApplications" 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.PrivacySettings" - android:icon="@drawable/ic_settings_privacy" - android:title="@string/privacy_settings" - android:id="@+id/privacy_settings" /> - - <!-- Storage --> + 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:id="@+id/storage_settings" - android:fragment="com.android.settings.deviceinfo.Memory" - android:icon="@drawable/ic_settings_storage" - android:title="@string/storage_settings" /> + android:fragment="com.android.settings.SecuritySettings" + android:icon="@drawable/ic_settings_security" + android:title="@string/security_settings_title" + android:id="@+id/security_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 --> - + <!-- Backup and reset --> <header - android:id="@+id/accessibility_settings" - android:fragment="com.android.settings.AccessibilitySettings" - android:icon="@drawable/ic_settings_accessibility" - android:title="@string/accessibility_settings" /> + android:fragment="com.android.settings.PrivacySettings" + android:icon="@drawable/ic_settings_privacy" + android:title="@string/privacy_settings" + android:id="@+id/privacy_settings" /> - <!-- Dock --> + <!-- SYSTEM --> + <header android:title="@string/header_category_system" /> + + <!-- Dock --> <header android:id="@+id/dock_settings" android:fragment="com.android.settings.DockSettings" @@ -136,15 +156,27 @@ 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" /> + <!-- Development --> + <header + android:id="@+id/development_settings" + android:fragment="com.android.settings.DevelopmentSettings" + android:icon="@drawable/ic_settings_development" + android:title="@string/development_settings_title" /> + + <!-- 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/usb_settings.xml b/res/xml/usb_settings.xml new file mode 100644 index 0000000..e2a950d --- /dev/null +++ b/res/xml/usb_settings.xml @@ -0,0 +1,30 @@ +<?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="usb_mtp" + android:title="@string/usb_label_mtp" + /> + + <CheckBoxPreference + android:key="usb_ptp" + android:title="@string/usb_label_ptp" + /> + +</PreferenceScreen> diff --git a/res/xml/vpn_settings.xml b/res/xml/vpn_settings.xml deleted file mode 100644 index 773ae1c..0000000 --- a/res/xml/vpn_settings.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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/vpn_settings_activity_title"> - - <PreferenceScreen android:key="add_new_vpn" - android:title="@string/vpn_add_new_vpn"> - <!--intent - android:action="android.intent.action.MAIN" - android:targetPackage="com.android.settings.vpn" - android:targetClass="com.android.settings.vpn.VpnEditor" /--> - </PreferenceScreen> - - <!--CheckBoxPreference android:key="installer_enabled" - android:defaultValue="false" - android:title="@string/installer_enabled" - android:summaryOn="@string/installer_enabled_summary_on" - android:summaryOff="@string/installer_enabled_summary_off" /--> - - <PreferenceCategory android:key="vpn_list" android:title="@string/vpns"> - </PreferenceCategory> -</PreferenceScreen> diff --git a/res/xml/vpn_edit.xml b/res/xml/vpn_settings2.xml index a3cab9c..38632cc 100644 --- a/res/xml/vpn_edit.xml +++ b/res/xml/vpn_settings2.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project +<!-- 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. @@ -15,12 +15,9 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> - - <EditTextPreference - android:key="vpn_name" - android:title="@string/vpn_name" - android:dialogTitle="@string/vpn_name" - android:singleLine="true"/> - -</PreferenceScreen> + android:title="@string/vpn_title"> + <Preference android:key="add_network" + android:title="@string/vpn_create" + android:order="1" + android:persistent="false"/> +</PreferenceScreen> diff --git a/res/xml/vpn_type.xml b/res/xml/wallpaper_settings.xml index fbc7822..63346f7 100644 --- a/res/xml/vpn_type.xml +++ b/res/xml/wallpaper_settings.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 The Android Open Source Project +<!-- 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. @@ -15,7 +15,6 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" - android:title="@string/vpn_type_title"> + android:title="@string/wallpaper_settings_title"> -</PreferenceScreen> +</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..d7344b1 100644 --- a/res/xml/wifi_advanced_settings.xml +++ b/res/xml/wifi_advanced_settings.xml @@ -17,6 +17,29 @@ <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" /> + + <!-- android:dependency="enable_wifi" --> + <CheckBoxPreference + android:key="wifi_enable_watchdog_service" + android:title="@string/wifi_enable_watchdog_service" + android:summary="@string/wifi_enable_watchdog_service_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..0488e02 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.vpn2.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" |