auto import from //branches/cupcake/...@130745
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 1ba01c5..34029d1 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -15,8 +15,8 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
- <PreferenceCategory android:title="@string/apn_edit"/>
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/apn_edit">
<EditTextPreference
android:title="@string/apn_name"
android:dialogTitle="@string/apn_name"
@@ -52,7 +52,6 @@
android:dialogTitle="@string/apn_password"
android:key="apn_password"
android:singleLine="true"
- android:password="true"
/>
<EditTextPreference
android:title="@string/apn_server"
diff --git a/res/xml/apn_settings.xml b/res/xml/apn_settings.xml
index abf268b..86a336c 100644
--- 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">
- <PreferenceCategory android:title="@string/apn_settings" android:key="apn_list"/>
-</PreferenceScreen>
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/apn_settings" android:key="apn_list">
+</PreferenceScreen>
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index c4f2bd0..8d0a7cb 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -15,13 +15,10 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/applications_settings"
+ android:title="@string/applications_settings_header"
android:summary="@string/applications_settings_summary"
android:key="applications_settings">
- <PreferenceCategory
- android:title="@string/applications_settings_header"/>
-
<CheckBoxPreference
android:key="toggle_install_applications"
android:title="@string/install_applications"
@@ -39,7 +36,8 @@
</PreferenceScreen>
<PreferenceScreen
- android:title="@string/manage_applications_title">
+ android:title="@string/manageapplications_settings_title"
+ android:summary="@string/manageapplications_settings_summary">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.ManageApplications" />
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 8449343..131f7a0 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -15,10 +15,8 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:title="@string/bluetooth_settings" />
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/bluetooth_settings" >
<CheckBoxPreference
android:key="bt_checkbox"
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 47e047a..5e696de 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="@string/date_and_time"/>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/date_and_time">
<CheckBoxPreference android:key="auto_time"
android:title="@string/date_time_auto"
android:summaryOn="@string/date_time_auto_summaryOn"
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 286497e..77c100a 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -14,10 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:title="@string/development_settings_title"/>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/development_settings_title">
<CheckBoxPreference
android:key="enable_adb"
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index 0d90b95..b7ec3c1 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -26,7 +26,11 @@
android:title="@string/memory_available"
android:summary="00"/>
<Preference android:key="memory_sd_unmount"
- android:title="@string/sd_eject"/>
+ android:title="@string/sd_eject"
+ android:summary="@string/sd_eject_summary"/>
+ <Preference android:key="memory_sd_format"
+ android:title="@string/sd_format"
+ android:summary="@string/sd_format_summary"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/internal_memory">
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 07716da..205e588 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="@string/about_settings">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/about_settings">
<!-- System update settings - launches activity -->
<PreferenceScreen android:key="system_update_settings"
@@ -105,7 +105,5 @@
style="?android:preferenceInformationStyle"
android:title="@string/build_number"
android:summary="@string/device_info_default"/>
-
- </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 3e3be55..4c01690 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory android:title="@string/device_status_activity_title"/>
-
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/device_status_activity_title">
+
<Preference android:key="battery_status"
style="?android:attr/preferenceInformationStyle"
android:title="@string/battery_status_title"
@@ -87,6 +87,11 @@
android:title="@string/status_bt_address"
android:summary="@string/device_info_not_available"
android:persistent="false" />
+ <Preference android:key="network_traffic_stats"
+ style="?android:attr/preferenceInformationStyle"
+ android:title="@string/status_network_traffic_stats"
+ android:summary="@string/device_info_not_available"
+ android:persistent="false" />
<Preference android:key="up_time"
style="?android:attr/preferenceInformationStyle"
android:title="@string/status_up_time"
diff --git a/res/xml/input_methods_prefs.xml b/res/xml/input_methods_prefs.xml
index b8a415f..9a4f527 100644
--- a/res/xml/input_methods_prefs.xml
+++ b/res/xml/input_methods_prefs.xml
@@ -16,8 +16,7 @@
* limitations under the License.
*/
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <PreferenceCategory
- android:title="@string/input_methods_settings_title" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/input_methods_settings_title">
</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index ff123ed..2927540 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,24 +15,17 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
- <PreferenceCategory
- android:key="language_category"
- android:title="@string/language_category">
- <!--
- <ListPreference
- android:title="@string/phone_language"/>
- -->
-
- <PreferenceScreen
- android:title="@string/phone_language">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.LocalePicker"/>
- </PreferenceScreen>
- </PreferenceCategory>
-
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/language_settings">
+
+ <PreferenceScreen
+ android:title="@string/phone_language"
+ android:summary="@string/phone_language_summary">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.LocalePicker"/>
+ </PreferenceScreen>
+
<PreferenceCategory
android:title="@string/text_category" />
<PreferenceScreen
@@ -49,22 +42,26 @@
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.UserDictionarySettings" />
</PreferenceScreen>
- <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
+ android:key="hardkeyboard_category"
+ android:title="@string/hardkeyboard_category">
+ <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>
</PreferenceScreen>
diff --git a/res/xml/quick_launch_settings.xml b/res/xml/quick_launch_settings.xml
index 15950ac..eb5585c 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/xml/quick_launch_settings.xml
@@ -14,14 +14,10 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:key="shortcut_category"
- android:title="@string/quick_launch_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="shortcut_category"
+ android:title="@string/quick_launch_title">
- <!-- Preferences will be filled here. -->
-
- </PreferenceCategory>
+ <!-- Preferences will be filled here. -->
</PreferenceScreen>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e484e86..5c0a1e1 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -15,10 +15,9 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory android:title="@string/settings_label"
- android:key="parent">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/settings_label"
+ android:key="parent">
<PreferenceScreen
android:title="@string/radio_controls_title"
@@ -127,6 +126,4 @@
android:targetClass="com.android.settings.DeviceInfoSettings" />
</PreferenceScreen>
- </PreferenceCategory>
-
</PreferenceScreen>
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index a784cc1..b2ecb11 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -15,10 +15,8 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
- <PreferenceCategory
- android:title="@string/sim_lock_settings"/>
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/sim_lock_settings">
<CheckBoxPreference
android:key="sim_toggle"
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 709f89b..2aa44c8 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -57,8 +57,7 @@
android:key="vibrate"
android:title="@string/vibrate_title"
android:summary="@string/vibrate_summary"
- android:persistent="false"
- android:dependency="silent" />
+ android:persistent="false" />
<com.android.settings.DefaultRingtonePreference
android:key="notification_sound"
@@ -85,6 +84,14 @@
android:dependency="silent"
android:defaultValue="true" />
+ <CheckBoxPreference
+ android:key="play_media_notification_sounds"
+ android:title="@string/play_media_notification_sounds_enable_title"
+ android:summaryOn="@string/play_media_notification_sounds_enable_summary_on"
+ android:summaryOff="@string/play_media_notification_sounds_enable_summary_off"
+ android:dependency="silent"
+ android:defaultValue="true" />
+
</PreferenceCategory>
<PreferenceCategory
@@ -94,19 +101,20 @@
android:key="animations"
android:title="@string/animations_title"
android:summaryOn="@string/animations_summary_on"
- android:summaryOff="@string/animations_summary_off"
- android:dependency="silent" />
+ android:summaryOff="@string/animations_summary_off" />
<com.android.settings.BrightnessPreference
android:key="brightness"
android:title="@string/brightness"
+ android:summary="@string/brightness_summary"
android:dialogIcon="@drawable/ic_popup_brightness"
android:dialogTitle="@string/brightness" />
<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" />
diff --git a/res/xml/testing_settings.xml b/res/xml/testing_settings.xml
index 714523b..87c9cf8 100644
--- a/res/xml/testing_settings.xml
+++ b/res/xml/testing_settings.xml
@@ -14,10 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:title="@string/testing" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/testing" >
<PreferenceScreen
android:title="@string/testing_phone_info">
@@ -38,9 +36,15 @@
android:title="@string/testing_battery_history">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.BatteryHistory" />
+ android:targetClass="com.android.settings.battery_history.BatteryHistory" />
</PreferenceScreen>
+ <PreferenceScreen
+ android:title="@string/testing_usage_stats">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.UsageStats" />
+ </PreferenceScreen>
<!--
<PreferenceScreen
android:title="@string/testing_sim_toolkit">
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index b3ce469..3e0ff05 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -14,11 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:title="@string/wifi_advanced_titlebar"
- />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/wifi_advanced_titlebar">
<ListPreference
android:key="num_channels"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 7b70621..9101e46 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -14,25 +14,21 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/wifi_settings_category">
- <PreferenceCategory
- android:title="@string/wifi_settings_category">
+ <CheckBoxPreference
+ android:key="wifi_enabled"
+ android:title="@string/wifi"
+ android:summary="@string/wifi_quick_toggle_summary"
+ android:persistent="false" />
- <CheckBoxPreference
- android:key="wifi_enabled"
- android:title="@string/wifi"
- android:summary="@string/wifi_quick_toggle_summary"
- android:persistent="false" />
-
- <CheckBoxPreference
- android:key="open_network_notifications_enabled"
- android:dependency="wifi_enabled"
- android:title="@string/wifi_notify_open_networks"
- android:summary="@string/wifi_notify_open_networks_summary"
- android:persistent="false" />
-
- </PreferenceCategory>
+ <CheckBoxPreference
+ android:key="open_network_notifications_enabled"
+ android:dependency="wifi_enabled"
+ android:title="@string/wifi_notify_open_networks"
+ android:summary="@string/wifi_notify_open_networks_summary"
+ android:persistent="false" />
<com.android.settings.ProgressCategory
android:key="access_points"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 5cef5e9..f81fb41 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -14,10 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
- <PreferenceCategory
- android:title="@string/radio_controls_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/radio_controls_title">
<!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
<CheckBoxPreference
@@ -54,13 +52,6 @@
android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
</PreferenceScreen>
- <CheckBoxPreference
- android:key="toggle_airplane"
- android:title="@string/airplane_mode"
- android:summary="@string/airplane_mode_summary"
- android:persistent="false"
- android:disableDependentsState="true" />
-
<PreferenceScreen
android:title="@string/network_settings_title"
android:summary="@string/network_settings_summary"
@@ -71,6 +62,12 @@
android:targetClass="com.android.phone.Settings" />
</PreferenceScreen>
- </PreferenceCategory>
+ <CheckBoxPreference
+ android:key="toggle_airplane"
+ android:title="@string/airplane_mode"
+ android:summary="@string/airplane_mode_summary"
+ android:persistent="false"
+ android:disableDependentsState="true" />
+
</PreferenceScreen>