auto import from //depot/cupcake/@135843

22 files changed, 1382 insertions, 0 deletions

diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
new file mode 100644
index 000000000..34029d185
--- /dev/null
+++ b/res/xml/apn_editor.xml
@@ -0,0 +1,98 @@
+<?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"
+        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"
+        android:key="apn_name"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_apn"
+        android:dialogTitle="@string/apn_apn"
+        android:key="apn_apn"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_http_proxy"
+        android:dialogTitle="@string/apn_http_proxy"
+        android:key="apn_http_proxy"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_http_port"
+        android:dialogTitle="@string/apn_http_port"
+        android:key="apn_http_port"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_user"
+        android:dialogTitle="@string/apn_user"
+        android:key="apn_user"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_password"
+        android:dialogTitle="@string/apn_password"
+        android:key="apn_password"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_server"
+        android:dialogTitle="@string/apn_server"
+        android:key="apn_server"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_mmsc"
+        android:dialogTitle="@string/apn_mmsc"
+        android:key="apn_mmsc"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_mms_proxy"
+        android:dialogTitle="@string/apn_mms_proxy"
+        android:key="apn_mms_proxy"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_mms_port"
+        android:dialogTitle="@string/apn_mms_port"
+        android:key="apn_mms_port"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_mcc"
+        android:dialogTitle="@string/apn_mcc"
+        android:key="apn_mcc"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_mnc"
+        android:dialogTitle="@string/apn_mnc"
+        android:key="apn_mnc"
+        android:singleLine="true"
+        />
+    <EditTextPreference
+        android:title="@string/apn_type"
+        android:dialogTitle="@string/apn_type"
+        android:key="apn_type"
+        android:singleLine="true"
+        />
+</PreferenceScreen>   
diff --git a/res/xml/apn_settings.xml b/res/xml/apn_settings.xml
new file mode 100644
index 000000000..86a336c34
--- /dev/null
+++ b/res/xml/apn_settings.xml
@@ -0,0 +1,20 @@
+<?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"
+        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
new file mode 100644
index 000000000..8d0a7cb51
--- /dev/null
+++ b/res/xml/application_settings.xml
@@ -0,0 +1,55 @@
+<?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/applications_settings_header"
+        android:summary="@string/applications_settings_summary"
+        android:key="applications_settings">
+
+    <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" />
+        
+    <PreferenceScreen
+            android:key="quick_launch"
+            android:title="@string/quick_launch_title"
+            android:summary="@string/quick_launch_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.quicklaunch.QuickLaunchSettings" />
+    </PreferenceScreen>
+        
+    <PreferenceScreen
+            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" />
+    </PreferenceScreen>
+
+    <PreferenceScreen 
+            android:title="@string/development_settings_title" 
+            android:summary="@string/development_settings_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.DevelopmentSettings" />
+    </PreferenceScreen>
+    
+</PreferenceScreen>
+
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
new file mode 100644
index 000000000..561159529
--- /dev/null
+++ b/res/xml/bluetooth_device_advanced.xml
@@ -0,0 +1,36 @@
+<?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">
+
+    <PreferenceCategory
+            android:key="title" />
+            
+    <CheckBoxPreference
+            android:key="online_mode"
+            android:title="@string/bluetooth_device_advanced_online_mode_title"
+            android:persistent="false" />
+                
+    <PreferenceCategory
+            android:key="profile_container"
+            android:title="@string/bluetooth_device_advanced_profile_header_title">
+
+        <!-- Profile checkboxes will be added here programmatically. -->
+        
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
new file mode 100644
index 000000000..131f7a01e
--- /dev/null
+++ b/res/xml/bluetooth_settings.xml
@@ -0,0 +1,54 @@
+<?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_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" />
+
+    <Preference
+        android:key="bt_scan"
+        android:dependency="bt_checkbox"
+        android:title="@string/bluetooth_preference_scan_title" />
+
+    <com.android.settings.ProgressCategory
+        android:key="bt_device_list"
+        android:title="@string/bluetooth_devices"
+        android:dependency="bt_checkbox"
+        android:orderingFromXml="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
new file mode 100644
index 000000000..5e696de1c
--- /dev/null
+++ b/res/xml/date_time_prefs.xml
@@ -0,0 +1,44 @@
+<?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/date_and_time">
+    <CheckBoxPreference android:key="auto_time" 
+        android:title="@string/date_time_auto"
+        android:summaryOn="@string/date_time_auto_summaryOn"
+        android:summaryOff="@string/date_time_auto_summaryOff"
+        />
+    <Preference android:key="date" 
+        android:title="@string/date_time_set_date" 
+        android:summary="03/10/2008"
+        />
+    <PreferenceScreen android:key="timezone" 
+        android:title="@string/date_time_set_timezone" 
+        android:summary="GMT-8:00"
+        />
+    <Preference android:key="time" 
+        android:title="@string/date_time_set_time" 
+        android:summary="12:00am"
+        />
+    <CheckBoxPreference android:key="24 hour" 
+        android:title="@string/date_time_24hour"
+        android:summaryOn="@string/date_time_24_hour_sample"
+        android:summaryOff="@string/date_time_12_hour_sample"/>
+    <ListPreference
+        android:key="date_format"
+        android:title="@string/date_time_date_format" 
+        android:summary="mm/dd/yyyy"/>
+</PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
new file mode 100644
index 000000000..77c100a84
--- /dev/null
+++ b/res/xml/development_prefs.xml
@@ -0,0 +1,35 @@
+<?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/development_settings_title">
+        
+    <CheckBoxPreference 
+        android:key="enable_adb" 
+        android:title="@string/enable_adb" 
+        android:summary="@string/enable_adb_summary"/>
+
+    <CheckBoxPreference 
+        android:key="keep_screen_on" 
+        android:title="@string/keep_screen_on" 
+        android:summary="@string/keep_screen_on_summary"/>
+
+    <CheckBoxPreference 
+        android:key="allow_mock_location" 
+        android:title="@string/allow_mock_location" 
+        android:summary="@string/allow_mock_location_summary"/>
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
new file mode 100644
index 000000000..b7ec3c13a
--- /dev/null
+++ b/res/xml/device_info_memory.xml
@@ -0,0 +1,50 @@
+<?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">
+
+    <PreferenceCategory android:title="@string/sd_memory">
+        <Preference android:key="memory_sd_size" 
+            style="?android:attr/preferenceInformationStyle" 
+            android:title="@string/memory_size"
+            android:summary="00"/>
+        <Preference android:key="memory_sd_avail" 
+            style="?android:attr/preferenceInformationStyle" 
+            android:title="@string/memory_available"
+            android:summary="00"/>
+        <Preference android:key="memory_sd_unmount"
+            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">
+        <Preference android:key="memory_internal_avail" 
+            style="?android:attr/preferenceInformationStyle" 
+            android:title="@string/memory_available"
+            android:summary="00"/>
+        <PreferenceScreen 
+            android:title="@string/master_clear_title" 
+            android:summary="@string/master_clear_summary">
+            <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.MasterClear" />
+        </PreferenceScreen>
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
new file mode 100644
index 000000000..205e5884f
--- /dev/null
+++ b/res/xml/device_info_settings.xml
@@ -0,0 +1,109 @@
+<?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/about_settings">
+
+        <!-- System update settings - launches activity -->
+        <PreferenceScreen android:key="system_update_settings"
+                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: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>
+        
+        <!-- Legal Information -->
+        <PreferenceScreen
+                android:key="container"
+                android:title="@string/legal_information">
+
+            <!-- Title for this other screen -->
+            <PreferenceCategory 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
+                       list. -->
+
+            <!-- Copyright information -->
+            <PreferenceScreen
+                    android:key="copyright"
+                    android:title="@string/copyright_title">
+                <intent android:action="android.settings.COPYRIGHT" />
+            </PreferenceScreen>
+
+            <!-- License information -->
+            <PreferenceScreen
+                    android:key="license"
+                    android:title="@string/license_title">
+                <intent android:action="android.settings.LICENSE" />
+            </PreferenceScreen>
+
+            <!-- Terms and conditions -->
+            <PreferenceScreen
+                    android:key="terms"
+                    android:title="@string/terms_title">
+                <intent android:action="android.settings.TERMS" />
+            </PreferenceScreen>
+
+        </PreferenceScreen>
+        
+        <!-- Contributors -->
+        <PreferenceScreen
+                android:key="contributors"
+                android:title="@string/contributors_title">
+            <intent android:action="android.settings.TEAM" />
+        </PreferenceScreen>
+        
+        <!-- Device hardware 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" 
+                style="?android:preferenceInformationStyle"
+                android:title="@string/firmware_version"
+                android:summary="@string/device_info_default"/>
+                
+        <!-- Device 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" 
+                style="?android:preferenceInformationStyle"
+                android:title="@string/kernel_version"
+                android:summary="@string/device_info_default"/>
+
+        <!-- Detailed build version -->
+        <Preference android:key="build_number" 
+                style="?android:preferenceInformationStyle"
+                android:title="@string/build_number"
+                android:summary="@string/device_info_default"/>
+
+</PreferenceScreen>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
new file mode 100644
index 000000000..95377953e
--- /dev/null
+++ b/res/xml/device_info_status.xml
@@ -0,0 +1,101 @@
+<?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/device_status_activity_title">
+
+    <Preference android:key="battery_status" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/battery_status_title"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="battery_level" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/battery_level_title"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="number" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_number"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="operator_name" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_operator"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="signal_strength"
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_signal_strength"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="network_type"
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_network_type"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="service_state" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_service_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="roaming_state" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_roaming"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="data_state"
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_data_state"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="imei" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_imei"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="imei_sv" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_imei_sv"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="wifi_mac_address"
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_wifi_mac_address"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="bt_address"
+        style="?android:attr/preferenceInformationStyle" 
+        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"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+    <Preference android:key="awake_time"
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_awake_time"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/input_methods_prefs.xml b/res/xml/input_methods_prefs.xml
new file mode 100644
index 000000000..9a4f527b6
--- /dev/null
+++ b/res/xml/input_methods_prefs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 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/input_methods_settings_title">
+
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
new file mode 100644
index 000000000..050896f0e
--- /dev/null
+++ b/res/xml/language_settings.xml
@@ -0,0 +1,62 @@
+<?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"
+        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:key="text_category"
+            android:title="@string/text_category" />
+
+    <PreferenceScreen 
+            android:title="@string/user_dict_settings_title" 
+            android:summary="@string/user_dict_settings_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.UserDictionarySettings" />
+    </PreferenceScreen>
+
+    <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
new file mode 100644
index 000000000..eb5585cfe
--- /dev/null
+++ b/res/xml/quick_launch_settings.xml
@@ -0,0 +1,23 @@
+<?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:key="shortcut_category"
+        android:title="@string/quick_launch_title">
+            
+    <!-- Preferences will be filled here. -->
+
+</PreferenceScreen>   
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
new file mode 100644
index 000000000..788aae3d6
--- /dev/null
+++ b/res/xml/security_settings.xml
@@ -0,0 +1,36 @@
+<?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">
+
+    <PreferenceCategory
+        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"/>
+            
+    </PreferenceCategory>
+            
+</PreferenceScreen>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
new file mode 100644
index 000000000..5c0a1e185
--- /dev/null
+++ b/res/xml/settings.xml
@@ -0,0 +1,129 @@
+<?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/settings_label"
+    android:key="parent">
+            
+        <PreferenceScreen
+            android:title="@string/radio_controls_title"
+            android:summary="@string/radio_controls_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.WirelessSettings" />
+        </PreferenceScreen>
+
+        <PreferenceScreen
+            android:key="call_settings"
+            android:title="@string/call_settings_title"
+            android:summary="@string/call_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.phone"
+                android:targetClass="com.android.phone.CallFeaturesSetting" />
+        </PreferenceScreen>
+
+        <!-- Sound and Display -->
+        
+        <PreferenceScreen
+            android:title="@string/sound_and_display_settings"
+            android:summary="@string/sound_and_display_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.SoundAndDisplaySettings" />
+        </PreferenceScreen>
+
+        <!-- Data Sync. The settings activity will ensure this is resolved to an
+             activity on the system image, otherwise it will remove this
+             preference. -->
+        
+        <PreferenceScreen
+            android:title="@string/sync_settings"
+            android:summary="@string/sync_settings_summary"
+            android:key="sync_settings">
+            <intent android:action="android.settings.SYNC_SETTINGS" />
+        </PreferenceScreen>
+
+        <!-- Security & Privacy -->
+        
+        <PreferenceScreen
+            android:title="@string/security_settings_title"
+            android:summary="@string/security_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.SecuritySettings" />
+        </PreferenceScreen>
+
+        <!-- Application Settings -->
+        
+        <PreferenceScreen
+            android:title="@string/applications_settings"
+            android:summary="@string/applications_settings_summary"
+            android:key="applications_settings">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.ApplicationSettings" />
+        </PreferenceScreen>
+
+        <!-- Storage -->
+        
+        <PreferenceScreen 
+            android:title="@string/storage_settings_title" 
+            android:summary="@string/storage_settings_summary">
+            <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.deviceinfo.Memory" />
+        </PreferenceScreen>
+
+        <!-- Date & Time -->
+        
+        <PreferenceScreen
+            android:title="@string/date_and_time_settings_title"
+            android:summary="@string/date_and_time_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.DateTimeSettings" />
+        </PreferenceScreen>
+
+        <!-- Language -->
+
+        <PreferenceScreen
+            android:title="@string/language_settings"
+            android:summary="@string/language_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.LanguageSettings" />
+        </PreferenceScreen>
+
+        <!-- About Device -->
+ 
+        <PreferenceScreen
+            android:title="@string/about_settings"
+            android:summary="@string/about_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.DeviceInfoSettings" />
+        </PreferenceScreen>
+
+</PreferenceScreen>
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
new file mode 100644
index 000000000..b2ecb1104
--- /dev/null
+++ b/res/xml/sim_lock_settings.xml
@@ -0,0 +1,33 @@
+<?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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/sim_lock_settings">
+    
+    <CheckBoxPreference
+            android:key="sim_toggle"
+            android:title="@string/sim_pin_toggle"
+            android:summaryOn="@string/sim_lock_on"
+            android:summaryOff="@string/sim_lock_off"/>
+    <com.android.settings.EditPinPreference
+            android:key="sim_pin"
+            android:title="@string/sim_pin_change"
+            android:dialogTitle="@string/sim_change_pin"
+            android:dialogMessage="@string/sim_enter_old"
+            android:positiveButtonText="@string/sim_enter_ok"
+            android:negativeButtonText="@string/sim_enter_cancel"/>
+</PreferenceScreen>   
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
new file mode 100644
index 000000000..2aa44c837
--- /dev/null
+++ b/res/xml/sound_and_display_settings.xml
@@ -0,0 +1,124 @@
+<?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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        
+    <PreferenceCategory
+            android:title="@string/sound_settings">
+            
+        <CheckBoxPreference
+                android:key="silent"
+                android:title="@string/silent_mode_title"
+                android:summary="@string/silent_mode_summary"
+                android:persistent="false"
+                android:disableDependentsState="true" />
+    
+        <com.android.settings.RingerVolumePreference
+                android:key="ring_volume"
+                android:title="@string/ring_volume_title"
+                android:summary="@string/ring_volume_summary"
+                android:dialogTitle="@string/ring_volume_title"
+                android:persistent="false"
+                android:dependency="silent"
+                android:streamType="ring" />
+    
+        <VolumePreference
+                android:key="media_volume"
+                android:title="@string/media_volume_title"
+                android:summary="@string/media_volume_summary"
+                android:dialogTitle="@string/media_volume_title"
+                android:persistent="false"
+                android:streamType="music" />
+    
+        <com.android.settings.DefaultRingtonePreference
+                android:key="ringtone"
+                android:title="@string/ringtone_title"
+                android:summary="@string/ringtone_summary"
+                android:dialogTitle="@string/ringtone_title"
+                android:persistent="false"
+                android:dependency="silent"
+                android:ringtoneType="ringtone" />
+    
+        <CheckBoxPreference
+                android:key="vibrate"
+                android:title="@string/vibrate_title"
+                android:summary="@string/vibrate_summary"
+                android:persistent="false" />
+    
+        <com.android.settings.DefaultRingtonePreference
+                android:key="notification_sound"
+                android:title="@string/notification_sound_title"
+                android:summary="@string/notification_sound_summary"
+                android:dialogTitle="@string/notification_sound_dialog_title"
+                android:dependency="silent"
+                android:persistent="false"
+                android:ringtoneType="notification" />
+                
+        <CheckBoxPreference
+                android:key="dtmf_tone"
+                android:title="@string/dtmf_tone_enable_title"
+                android:summaryOn="@string/dtmf_tone_enable_summary_on"
+                android:summaryOff="@string/dtmf_tone_enable_summary_off"
+                android:dependency="silent"
+                android:defaultValue="true" />
+
+        <CheckBoxPreference
+                android:key="sound_effects"
+                android:title="@string/sound_effects_enable_title"
+                android:summaryOn="@string/sound_effects_enable_summary_on"
+                android:summaryOff="@string/sound_effects_enable_summary_off"
+                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
+            android:title="@string/display_settings">
+
+        <CheckBoxPreference
+                android:key="animations"
+                android:title="@string/animations_title"
+                android:summaryOn="@string/animations_summary_on"
+                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" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>   
diff --git a/res/xml/testing_settings.xml b/res/xml/testing_settings.xml
new file mode 100644
index 000000000..87c9cf8ee
--- /dev/null
+++ b/res/xml/testing_settings.xml
@@ -0,0 +1,58 @@
+<?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/testing" >
+            
+    <PreferenceScreen
+            android:title="@string/testing_phone_info">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.RadioInfo" />
+    </PreferenceScreen>
+        
+    <PreferenceScreen
+            android:title="@string/testing_battery_info">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.BatteryInfo" />
+    </PreferenceScreen>
+
+
+    <PreferenceScreen
+            android:title="@string/testing_battery_history">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                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">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.stk"
+                android:targetClass="com.android.stk.StkSettings" />
+    </PreferenceScreen>
+    -->
+
+</PreferenceScreen>
+        
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
new file mode 100644
index 000000000..e515f16b7
--- /dev/null
+++ b/res/xml/timezones.xml
@@ -0,0 +1,84 @@
+<timezones>
+    <timezone id="Pacific/Majuro">Marshall Islands</timezone>
+    <timezone id="Pacific/Midway">Midway Island</timezone>
+    <timezone id="Pacific/Honolulu">Hawaii</timezone>
+    <timezone id="America/Anchorage">Alaska</timezone>
+    <timezone id="America/Los_Angeles">Pacific Time</timezone>
+    <timezone id="America/Tijuana">Tijuana</timezone>
+    <timezone id="America/Phoenix">Arizona</timezone>
+    <timezone id="America/Chihuahua">Chihuahua</timezone>
+    <timezone id="America/Denver">Mountain Time</timezone>
+    <timezone id="America/Costa_Rica">Central America</timezone>
+    <timezone id="America/Chicago">Central Time</timezone>
+    <timezone id="America/Mexico_City">Mexico City</timezone>
+    <timezone id="America/Regina">Saskatchewan</timezone>
+    <timezone id="America/Bogota">Bogota</timezone>
+    <timezone id="America/New_York">Eastern Time</timezone>
+    <timezone id="America/Caracas">Venezuela</timezone>
+    <timezone id="America/Barbados">Atlantic Time</timezone>
+    <timezone id="America/Manaus">Manaus</timezone>
+    <timezone id="America/Santiago">Santiago</timezone>
+    <timezone id="America/St_Johns">Newfoundland</timezone>
+    <timezone id="America/Araguaina">Brasilia</timezone>
+    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
+    <timezone id="America/Godthab">Greenland</timezone>
+    <timezone id="America/Montevideo">Montevideo</timezone>
+    <timezone id="Atlantic/South_Georgia">Mid-Atlantic</timezone>
+    <timezone id="Atlantic/Azores">Azores</timezone>
+    <timezone id="Atlantic/Cape_Verde">Cape Verde Islands</timezone>
+    <timezone id="Africa/Casablanca">Casablanca</timezone>
+    <timezone id="Europe/London">London, Dublin</timezone>
+    <timezone id="Europe/Amsterdam">Amsterdam, Berlin</timezone>
+    <timezone id="Europe/Belgrade">Belgrade</timezone>
+    <timezone id="Europe/Brussels">Brussels</timezone>
+    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
+    <timezone id="Africa/Windhoek">Windhoek</timezone>
+    <timezone id="Africa/Brazzaville">W. Africa Time</timezone>
+    <timezone id="Asia/Amman">Amman, Jordan</timezone>
+    <timezone id="Europe/Athens">Athens, Istanbul</timezone>
+    <timezone id="Asia/Beirut">Beirut, Lebanon</timezone>
+    <timezone id="Africa/Cairo">Cairo</timezone>
+    <timezone id="Europe/Helsinki">Helsinki</timezone>
+    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
+    <timezone id="Europe/Minsk">Minsk</timezone>
+    <timezone id="Africa/Harare">Harare</timezone>
+    <timezone id="Asia/Baghdad">Baghdad</timezone>
+    <timezone id="Europe/Moscow">Moscow</timezone>
+    <timezone id="Asia/Kuwait">Kuwait</timezone>
+    <timezone id="Africa/Nairobi">Nairobi</timezone>
+    <timezone id="Asia/Tehran">Tehran</timezone>
+    <timezone id="Asia/Baku">Baku</timezone>
+    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
+    <timezone id="Asia/Yerevan">Yerevan</timezone>
+    <timezone id="Asia/Dubai">Dubai</timezone>
+    <timezone id="Asia/Kabul">Kabul</timezone>
+    <timezone id="Asia/Karachi">Islamabad, Karachi</timezone>
+    <timezone id="Asia/Oral">Ural'sk</timezone>
+    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
+    <timezone id="Asia/Calcutta">Kolkata</timezone>
+    <timezone id="Asia/Colombo">Sri Lanka</timezone>
+    <timezone id="Asia/Katmandu">Kathmandu</timezone>
+    <timezone id="Asia/Almaty">Astana</timezone>
+    <timezone id="Asia/Rangoon">Yangon</timezone>
+    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
+    <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Hong_Kong">Beijing, Hong Kong</timezone>
+    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
+    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
+    <timezone id="Australia/Perth">Perth</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
+    <timezone id="Asia/Seoul">Seoul</timezone>
+    <timezone id="Asia/Tokyo">Tokyo, Osaka</timezone>
+    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
+    <timezone id="Australia/Adelaide">Adelaide</timezone>
+    <timezone id="Australia/Darwin">Darwin</timezone>
+    <timezone id="Australia/Brisbane">Brisbane</timezone>
+    <timezone id="Australia/Hobart">Hobart</timezone>
+    <timezone id="Australia/Sydney">Sydney, Canberra</timezone>
+    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
+    <timezone id="Pacific/Guam">Guam</timezone>
+    <timezone id="Asia/Magadan">Magadan</timezone>
+    <timezone id="Pacific/Auckland">Auckland</timezone>
+    <timezone id="Pacific/Fiji">Fiji</timezone>
+    <timezone id="Pacific/Tongatapu">Tonga</timezone>
+</timezones>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
new file mode 100644
index 000000000..3e0ff053f
--- /dev/null
+++ b/res/xml/wifi_advanced_settings.xml
@@ -0,0 +1,91 @@
+<?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/wifi_advanced_titlebar">
+
+    <ListPreference
+            android:key="num_channels"
+            android:title="@string/wifi_setting_num_channels_title"
+            android:summary="@string/wifi_setting_num_channels_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"
+            />
+    
+    <Preference android:key="mac_address" 
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/wifi_advanced_mac_address_title"
+        />
+    
+    <PreferenceCategory
+            android:title="@string/wifi_ip_settings_titlebar"
+            />
+    
+    <CheckBoxPreference
+            android:key="use_static_ip"
+            android:title="@string/wifi_use_static_ip"
+            android:persistent="false"
+            />    
+    
+    <EditTextPreference
+            android:dependency="use_static_ip"
+            android:key="ip_address"
+            android:title="@string/wifi_ip_address"
+            android:persistent="false"
+            android:singleLine="true"
+            />    
+    
+    <EditTextPreference
+            android:dependency="use_static_ip"
+            android:key="gateway"
+            android:title="@string/wifi_gateway"
+            android:persistent="false"
+            android:singleLine="true"
+            />    
+    
+    <EditTextPreference
+            android:dependency="use_static_ip"
+            android:key="netmask"
+            android:title="@string/wifi_netmask"
+            android:persistent="false"
+            android:singleLine="true"
+            />    
+
+    <EditTextPreference
+            android:dependency="use_static_ip"
+            android:key="dns1"
+            android:title="@string/wifi_dns1"
+            android:persistent="false"
+            android:singleLine="true"
+            />    
+    
+    <EditTextPreference
+            android:dependency="use_static_ip"
+            android:key="dns2"
+            android:title="@string/wifi_dns2"
+            android:persistent="false"
+            android:singleLine="true"
+            />    
+    
+</PreferenceScreen>   
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
new file mode 100644
index 000000000..9101e46e5
--- /dev/null
+++ b/res/xml/wifi_settings.xml
@@ -0,0 +1,45 @@
+<?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/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="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"
+            android:dependency="wifi_enabled"
+            android:title="@string/wifi_access_points" 
+            android:persistent="false" />
+
+    <Preference
+            android:key="add_other_network"
+            android:dependency="wifi_enabled"
+            android:title="@string/wifi_add_other_network"
+            android:persistent="false" />
+
+</PreferenceScreen>   
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
new file mode 100644
index 000000000..f81fb4163
--- /dev/null
+++ b/res/xml/wireless_settings.xml
@@ -0,0 +1,73 @@
+<?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/radio_controls_title">
+
+                <!-- 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"
+                    android:dependency="toggle_airplane" />
+
+                <PreferenceScreen
+                    android:title="@string/wifi_settings"
+                    android:summary="@string/wifi_settings_summary"
+                    android:dependency="toggle_airplane">
+                    <intent
+                        android:action="android.intent.action.MAIN"
+                        android:targetPackage="com.android.settings"
+                        android:targetClass="com.android.settings.wifi.WifiSettings" />
+                </PreferenceScreen>
+
+                <CheckBoxPreference
+                    android:key="toggle_bluetooth"
+                    android:title="@string/bluetooth_quick_toggle_title"
+                    android:summary="@string/bluetooth_quick_toggle_summary"
+                    android:persistent="false"
+                    android:dependency="toggle_airplane" />
+
+                <PreferenceScreen
+                    android:title="@string/bluetooth_settings_title"
+                    android:summary="@string/bluetooth_settings_summary"
+                    android:dependency="toggle_airplane">
+                    <intent
+                        android:action="android.intent.action.MAIN"
+                        android:targetPackage="com.android.settings"
+                        android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
+                </PreferenceScreen>
+
+                <PreferenceScreen
+                    android:title="@string/network_settings_title"
+                    android:summary="@string/network_settings_summary"
+                    android:dependency="toggle_airplane">
+                    <intent
+                        android:action="android.intent.action.MAIN"
+                        android:targetPackage="com.android.phone"
+                        android:targetClass="com.android.phone.Settings" />
+                </PreferenceScreen>
+
+                <CheckBoxPreference
+                    android:key="toggle_airplane"
+                    android:title="@string/airplane_mode"
+                    android:summary="@string/airplane_mode_summary"
+                    android:persistent="false"
+                    android:disableDependentsState="true" />
+
+
+</PreferenceScreen>