Blanket copy of PhoneApp to services/Telephony.

First phase of splitting out InCallUI from PhoneApp.

Change-Id: I237341c4ff00e96c677caa4580b251ef3432931b
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
new file mode 100644
index 0000000..a418ee2
--- /dev/null
+++ b/res/xml/call_feature_setting.xml
@@ -0,0 +1,171 @@
+<?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:phone="http://schemas.android.com/apk/res/com.android.phone"
+    android:title="@string/call_settings">
+
+    <PreferenceCategory
+        android:key="button_ringtone_category_key"
+        android:title="@string/preference_category_ringtone"
+        android:persistent="false">
+
+        <com.android.phone.DefaultRingtonePreference
+            android:key="button_ringtone_key"
+            android:title="@string/ringtone_title"
+            android:dialogTitle="@string/ringtone_title"
+            android:persistent="false"
+            android:ringtoneType="ringtone" />
+
+        <CheckBoxPreference
+            android:key="button_vibrate_on_ring"
+            android:title="@string/vibrate_on_ring_title"
+            android:persistent="false"
+            android:defaultValue="false" />
+    </PreferenceCategory>
+
+  <PreferenceCategory
+      android:key="button_misc_category_key"
+      android:title="@string/other_settings"
+      android:persistent="false" />
+
+  <PreferenceScreen
+      android:key="button_voicemail_category_key"
+      android:title="@string/voicemail"
+      android:persistent="false">
+      <ListPreference
+          android:key="button_voicemail_provider_key"
+          android:title="@string/voicemail_provider"
+          android:summary="@string/sum_voicemail_choose_provider"
+          android:defaultValue=""
+          android:persistent="true" />
+      <PreferenceScreen
+          android:key="button_voicemail_setting_key"
+          android:title="@string/voicemail_settings"
+          android:persistent="false">
+
+          <!-- Note for all com.android.phone.EditPhoneNumberPreference objects
+
+               The last several attributes are for use with the EditText field
+               in the dialog.  These attributes are forwarded to that field
+               when the edittext is created.  The attributes include:
+               1. android:singleLine
+               2. android:autoText
+               3. android:background -->
+
+          <com.android.phone.EditPhoneNumberPreference
+              android:key="button_voicemail_key"
+              android:title="@string/voicemail_settings_number_label"
+              android:persistent="false"
+              android:dialogTitle="@string/voicemail"
+              phone:confirmMode="confirm"
+              android:singleLine="true"
+              android:autoText="false" />
+      </PreferenceScreen>
+
+      <RingtonePreference
+          android:key="button_voicemail_notification_ringtone_key"
+          android:title="@string/voicemail_notification_ringtone_title"
+          android:persistent="true"
+          android:ringtoneType="notification"
+          android:defaultValue="content://settings/system/notification_sound" />
+      <CheckBoxPreference
+          android:key="button_voicemail_notification_vibrate_key"
+          android:title="@string/voicemail_notification_vibrate_when_title"
+          android:persistent="true"
+          />
+  </PreferenceScreen>
+
+  <CheckBoxPreference
+      android:key="button_play_dtmf_tone"
+      android:title="@string/dtmf_tone_enable_title"
+      android:persistent="false"
+      android:defaultValue="true" />
+
+  <CheckBoxPreference
+      android:key="button_dialpad_autocomplete"
+      android:title="@string/dial_pad_autocomplete"
+      android:persistent="false"
+      android:defaultValue="false" />
+
+  <PreferenceScreen
+      android:key="button_respond_via_sms_key"
+      android:title="@string/respond_via_sms_setting_title"
+      android:summary="@string/respond_via_sms_setting_summary"
+      android:persistent="false">
+      <intent
+          android:action="android.intent.action.MAIN"
+          android:targetPackage="com.android.phone"
+          android:targetClass="com.android.phone.RespondViaSmsManager$Settings" />
+  </PreferenceScreen>
+
+  <PreferenceScreen
+      android:key="button_fdn_key"
+      android:title="@string/fdn"
+      android:persistent="false">
+      <intent android:action="android.intent.action.MAIN"
+          android:targetPackage="com.android.phone"
+          android:targetClass="com.android.phone.FdnSetting" />
+  </PreferenceScreen>
+
+    <CheckBoxPreference
+        android:key="button_auto_retry_key"
+        android:title="@string/auto_retry_mode_title"
+        android:persistent="false"
+        android:summary="@string/auto_retry_mode_summary"/>
+
+    <ListPreference
+        android:key="button_tty_mode_key"
+        android:title="@string/tty_mode_option_title"
+        android:summary="@string/tty_mode_option_summary"
+        android:persistent="false"
+        android:entries="@array/tty_mode_entries"
+        android:entryValues="@array/tty_mode_values"/>
+
+     <CheckBoxPreference
+        android:key="button_hac_key"
+        android:title="@string/hac_mode_title"
+        android:persistent="true"
+        android:summary="@string/hac_mode_summary"/>
+
+    <ListPreference
+        android:key="button_dtmf_settings"
+        android:title="@string/dtmf_tones_title"
+        android:summary="@string/dtmf_tones_summary"
+        android:entries="@array/dtmf_tone_entries"
+        android:entryValues="@array/dtmf_tone_values"/>
+
+    <PreferenceScreen
+        android:key="button_gsm_more_expand_key"
+        android:title="@string/labelGSMMore"
+        android:summary="@string/sum_gsm_call_settings"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.GsmUmtsCallOptions"/>
+    </PreferenceScreen>
+
+    <PreferenceScreen
+        android:key="button_cdma_more_expand_key"
+        android:title="@string/labelCDMAMore"
+        android:summary="@string/sum_cdma_call_settings"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.CdmaCallOptions"/>
+    </PreferenceScreen>
+</PreferenceScreen>
diff --git a/res/xml/callforward_options.xml b/res/xml/callforward_options.xml
new file mode 100644
index 0000000..0ff1e90
--- /dev/null
+++ b/res/xml/callforward_options.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
+     android:title="@string/call_forwarding_settings">
+
+
+    <!-- Note for all com.android.phone.EditPreference objects
+
+         The last several attributes are for use with the EditText field
+         in the dialog.  These attributes are forwarded to that field
+         when the edittext is created.  The attributes include:
+           1. android:singleLine
+           2. android:autoText
+           3. android:background -->
+
+    <com.android.phone.CallForwardEditPreference
+        android:key="button_cfu_key"
+        android:title="@string/labelCFU"
+        android:persistent="false"
+        android:summaryOn="@string/sum_cfu_enabled"
+        android:summaryOff="@string/sum_cfu_disabled"
+        android:dialogTitle="@string/labelCFU"
+        android:dialogMessage="@string/messageCFU"
+        phone:confirmMode="activation"
+        phone:serviceClass="voice"
+        phone:reason="unconditional"
+        android:singleLine="true"
+        android:autoText="false"
+        android:enabled="false" />
+
+    <!-- See note on com.android.phone.EditPreference above -->
+    <com.android.phone.CallForwardEditPreference
+        android:key="button_cfb_key"
+        android:title="@string/labelCFB"
+        android:persistent="false"
+        android:summaryOn="@string/sum_cfb_enabled"
+        android:summaryOff="@string/sum_cfb_disabled"
+        android:dialogTitle="@string/labelCFB"
+        android:dialogMessage="@string/messageCFB"
+        phone:confirmMode="activation"
+        phone:serviceClass="voice"
+        phone:reason="busy"
+        android:dependency="button_cfu_key"
+        android:singleLine="true"
+        android:autoText="false"
+        android:enabled="false" />
+
+    <!-- See note on com.android.phone.EditPreference above -->
+    <com.android.phone.CallForwardEditPreference
+        android:key="button_cfnry_key"
+        android:title="@string/labelCFNRy"
+        android:persistent="false"
+        android:summaryOn="@string/sum_cfnry_enabled"
+        android:summaryOff="@string/sum_cfnry_disabled"
+        android:dialogTitle="@string/labelCFNRy"
+        android:dialogMessage="@string/messageCFNRy"
+        phone:confirmMode="activation"
+        phone:serviceClass="voice"
+        phone:reason="no_reply"
+        android:dependency="button_cfu_key"
+        android:singleLine="true"
+        android:autoText="false"
+        android:enabled="false" />
+
+    <!-- See note on com.android.phone.EditPreference above -->
+    <com.android.phone.CallForwardEditPreference
+        android:key="button_cfnrc_key"
+        android:title="@string/labelCFNRc"
+        android:persistent="false"
+        android:summaryOn="@string/sum_cfnrc_enabled"
+        android:summaryOff="@string/sum_cfnrc_disabled"
+        android:dialogTitle="@string/labelCFNRc"
+        android:dialogMessage="@string/messageCFNRc"
+        phone:confirmMode="activation"
+        phone:serviceClass="voice"
+        phone:reason="not_reachable"
+        android:dependency="button_cfu_key"
+        android:singleLine="true"
+        android:autoText="false"
+        android:enabled="false" />
+</PreferenceScreen>
diff --git a/res/xml/carrier_select.xml b/res/xml/carrier_select.xml
new file mode 100644
index 0000000..bc223f1
--- /dev/null
+++ b/res/xml/carrier_select.xml
@@ -0,0 +1,29 @@
+<?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="list_networks_key" 
+        android:title="@string/label_available">
+    <Preference 
+        android:key="button_srch_netwrks_key" 
+        android:title="@string/search_networks"
+        android:summary="@string/sum_search_networks"
+        android:persistent="false"/>
+    <Preference 
+        android:key="button_auto_select_key" 
+        android:title="@string/select_automatically"
+        android:summary="@string/sum_select_automatically"
+        android:persistent="false"/>
+</PreferenceScreen>
diff --git a/res/xml/cdma_call_privacy.xml b/res/xml/cdma_call_privacy.xml
new file mode 100644
index 0000000..f1a4c94
--- /dev/null
+++ b/res/xml/cdma_call_privacy.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone"
+        android:title="@string/additional_cdma_call_settings">
+
+    <com.android.phone.CdmaVoicePrivacyCheckBoxPreference
+        android:key="button_voice_privacy_key"
+        android:title="@string/voice_privacy"
+        android:persistent="false"
+        android:summary="@string/voice_privacy_summary"/>
+</PreferenceScreen>
diff --git a/res/xml/cdma_options.xml b/res/xml/cdma_options.xml
new file mode 100644
index 0000000..89e2fab
--- /dev/null
+++ b/res/xml/cdma_options.xml
@@ -0,0 +1,43 @@
+<?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.phone">
+
+    <com.android.phone.CdmaSystemSelectListPreference
+        android:key="cdma_system_select_key"
+        android:title="@string/cdma_system_select_title"
+        android:summary="@string/cdma_system_select_summary"
+        android:entries="@array/cdma_system_select_choices"
+        android:entryValues="@array/cdma_system_select_values"
+        android:dialogTitle="@string/cdma_system_select_dialogtitle" />
+
+    <com.android.phone.CdmaSubscriptionListPreference
+        android:key="cdma_subscription_key"
+        android:title="@string/cdma_subscription_title"
+        android:summary="@string/cdma_subscription_summary"
+        android:entries="@array/cdma_subscription_choices"
+        android:entryValues="@array/cdma_subscription_values"
+        android:dialogTitle="@string/cdma_subscription_dialogtitle" />
+
+    <PreferenceScreen
+        android:key="cdma_activate_device_key"
+        android:title="@string/cdma_activate_device">
+        <intent android:action="com.android.phone.PERFORM_VOICELESS_CDMA_PROVISIONING">
+            <extra android:name="autoStart" android:value="true" />
+        </intent>
+    </PreferenceScreen>
+</PreferenceScreen>
diff --git a/res/xml/cell_broadcast_sms.xml b/res/xml/cell_broadcast_sms.xml
new file mode 100644
index 0000000..4b36d52
--- /dev/null
+++ b/res/xml/cell_broadcast_sms.xml
@@ -0,0 +1,317 @@
+<?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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone">
+        
+    <PreferenceCategory 
+        android:title="@string/cell_broadcast_sms">
+            
+    <CheckBoxPreference 
+        android:key="button_enable_disable_cell_bc_sms" 
+        android:title="@string/enable_disable_cell_bc_sms"
+        android:persistent="false"
+        android:summaryOn="@string/cell_bc_sms_enable"
+        android:summaryOff="@string/cell_bc_sms_disable"/>
+    
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+            android:title="@string/cb_sms_settings">
+        
+        <ListPreference
+            android:key="list_language" 
+            android:title="@string/list_language_title"
+            android:summary="@string/list_language_summary"
+            android:entries="@array/list_language_entries"
+            android:entryValues="@array/list_language_values"
+            android:dialogTitle="@string/list_language_dtitle"/>
+            
+        <CheckBoxPreference 
+                android:key="button_emergency_broadcast" 
+                android:title="@string/enable_disable_emergency_broadcast"
+                android:persistent="false"
+                android:summaryOn="@string/emergency_broadcast_enable"
+                android:summaryOff="@string/emergency_broadcast_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_administrative" 
+                android:title="@string/enable_disable_administrative"
+                android:persistent="false"
+                android:summaryOn="@string/administrative_enable"
+                android:summaryOff="@string/administrative_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_maintenance" 
+                android:title="@string/enable_disable_maintenance"
+                android:persistent="false"
+                android:summaryOn="@string/maintenance_enable"
+                android:summaryOff="@string/maintenance_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_local_weather" 
+                android:title="@string/enable_disable_local_weather"
+                android:persistent="false"
+                android:summaryOn="@string/local_weather_enable"
+                android:summaryOff="@string/local_weather_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_atr" 
+                android:title="@string/enable_disable_atr"
+                android:persistent="false"
+                android:summaryOn="@string/atr_enable"
+                android:summaryOff="@string/atr_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_lafs" 
+                android:title="@string/enable_disable_lafs"
+                android:persistent="false"
+                android:summaryOn="@string/lafs_enable"
+                android:summaryOff="@string/lafs_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_restaurants" 
+                android:title="@string/enable_disable_restaurants"
+                android:persistent="false"
+                android:summaryOn="@string/restaurants_enable"
+                android:summaryOff="@string/restaurants_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_lodgings" 
+                android:title="@string/enable_disable_lodgings"
+                android:persistent="false"
+                android:summaryOn="@string/lodgings_enable"
+                android:summaryOff="@string/lodgings_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_retail_directory" 
+                android:title="@string/enable_disable_retail_directory"
+                android:persistent="false"
+                android:summaryOn="@string/retail_directory_enable"
+                android:summaryOff="@string/retail_directory_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_advertisements" 
+                android:title="@string/enable_disable_advertisements"
+                android:persistent="false"
+                android:summaryOn="@string/advertisements_enable"
+                android:summaryOff="@string/advertisements_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_stock_quotes" 
+                android:title="@string/enable_disable_stock_quotes"
+                android:persistent="false"
+                android:summaryOn="@string/stock_quotes_enable"
+                android:summaryOff="@string/stock_quotes_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_eo" 
+                android:title="@string/enable_disable_eo"
+                android:persistent="false"
+                android:summaryOn="@string/eo_enable"
+                android:summaryOff="@string/eo_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_mhh" 
+                android:title="@string/enable_disable_mhh"
+                android:persistent="false"
+                android:summaryOn="@string/mhh_enable"
+                android:summaryOff="@string/mhh_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_technology_news" 
+                android:title="@string/enable_disable_technology_news"
+                android:persistent="false"
+                android:summaryOn="@string/technology_news_enable"
+                android:summaryOff="@string/technology_news_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_multi_category" 
+                android:title="@string/enable_disable_multi_category"
+                android:persistent="false"
+                android:summaryOn="@string/multi_category_enable"
+                android:summaryOff="@string/multi_category_disable"/>
+                
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+            android:title="@string/general_news_settings">
+        
+        <CheckBoxPreference 
+                android:key="button_local_general_news" 
+                android:title="@string/enable_disable_local"
+                android:persistent="false"
+                android:summaryOn="@string/local_enable"
+                android:summaryOff="@string/local_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_regional_general_news" 
+                android:title="@string/enable_disable_regional"
+                android:persistent="false"
+                android:summaryOn="@string/regional_enable"
+                android:summaryOff="@string/regional_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_national_general_news" 
+                android:title="@string/enable_disable_national"
+                android:persistent="false"
+                android:summaryOn="@string/national_enable"
+                android:summaryOff="@string/national_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_international_general_news" 
+                android:title="@string/enable_disable_international"
+                android:persistent="false"
+                android:summaryOn="@string/international_enable"
+                android:summaryOff="@string/international_disable"/>
+        <!--
+        <ListPreference 
+                android:key="list_general_news"
+                android:title="@string/general_news_title"
+                android:summary="@string/general_news_summary"
+                android:entries="@array/general_news_entries"
+                android:entryValues="@array/general_news_entryvalues"
+                android:dialogTitle="@string/general_news_dialogtitle"/> -->
+                
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+            android:title="@string/bf_news_settings">
+        
+        <CheckBoxPreference 
+                android:key="button_local_bf_news" 
+                android:title="@string/enable_disable_local"
+                android:persistent="false"
+                android:summaryOn="@string/local_enable"
+                android:summaryOff="@string/local_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_regional_bf_news" 
+                android:title="@string/enable_disable_regional"
+                android:persistent="false"
+                android:summaryOn="@string/regional_enable"
+                android:summaryOff="@string/regional_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_national_bf_news" 
+                android:title="@string/enable_disable_national"
+                android:persistent="false"
+                android:summaryOn="@string/national_enable"
+                android:summaryOff="@string/national_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_international_bf_news" 
+                android:title="@string/enable_disable_international"
+                android:persistent="false"
+                android:summaryOn="@string/international_enable"
+                android:summaryOff="@string/international_disable"/>
+                
+        <!--    
+        <ListPreference 
+                android:key="list_bf"
+                android:title="@string/bf_news_title"
+                android:summary="@string/bf_news_summary"
+                android:entries="@array/bf_news_entries"
+                android:entryValues="@array/bf_news_entryvalues"
+                android:dialogTitle="@string/bf_news_dialogtitle"/> -->
+    
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+            android:title="@string/sports_news_settings">
+        
+        <CheckBoxPreference 
+                android:key="button_local_sports_news" 
+                android:title="@string/enable_disable_local"
+                android:persistent="false"
+                android:summaryOn="@string/local_enable"
+                android:summaryOff="@string/local_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_regional_sports_news" 
+                android:title="@string/enable_disable_regional"
+                android:persistent="false"
+                android:summaryOn="@string/regional_enable"
+                android:summaryOff="@string/regional_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_national_sports_news" 
+                android:title="@string/enable_disable_national"
+                android:persistent="false"
+                android:summaryOn="@string/national_enable"
+                android:summaryOff="@string/national_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_international_sports_news" 
+                android:title="@string/enable_disable_international"
+                android:persistent="false"
+                android:summaryOn="@string/international_enable"
+                android:summaryOff="@string/international_disable"/>
+                
+        <!--    
+        <ListPreference 
+                android:key="list_sports_news"
+                android:title="@string/sports_news_title"
+                android:summary="@string/sports_news_summary"
+                android:entries="@array/sports_news_entries"
+                android:entryValues="@array/sports_news_entryvalues"
+                android:dialogTitle="@string/sports_news_dialogtitle"/> -->
+                
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+            android:title="@string/entertainment_news_settings">
+        
+        <CheckBoxPreference 
+                android:key="button_local_entertainment_news" 
+                android:title="@string/enable_disable_local"
+                android:persistent="false"
+                android:summaryOn="@string/local_enable"
+                android:summaryOff="@string/local_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_regional_entertainment_news" 
+                android:title="@string/enable_disable_regional"
+                android:persistent="false"
+                android:summaryOn="@string/regional_enable"
+                android:summaryOff="@string/regional_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_national_entertainment_news" 
+                android:title="@string/enable_disable_national"
+                android:persistent="false"
+                android:summaryOn="@string/national_enable"
+                android:summaryOff="@string/national_disable"/>
+                
+        <CheckBoxPreference 
+                android:key="button_international_entertainment_news" 
+                android:title="@string/enable_disable_international"
+                android:persistent="false"
+                android:summaryOn="@string/international_enable"
+                android:summaryOff="@string/international_disable"/>
+                
+        <!--    
+        <ListPreference 
+                android:key="list_entertainment_news"
+                android:title="@string/entertainment_news_title"
+                android:summary="@string/entertainment_news_summary"
+                android:entries="@array/entertainment_news_entries"
+                android:entryValues="@array/entertainment_news_entryvalues"
+                android:dialogTitle="@string/entertainment_news_dialogtitle"/> -->
+                
+    </PreferenceCategory>
+
+</PreferenceScreen>   
diff --git a/res/xml/data_usage_settings.xml b/res/xml/data_usage_settings.xml
new file mode 100644
index 0000000..fdadb25
--- /dev/null
+++ b/res/xml/data_usage_settings.xml
@@ -0,0 +1,43 @@
+<?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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone">
+
+    <Preference
+            android:key="throttle_current_usage"
+            style="?android:preferenceInformationStyle"
+            android:title="@string/throttle_current_usage"
+            android:persistent="false" />
+
+    <Preference
+            android:key="throttle_time_frame"
+            style="?android:preferenceInformationStyle"
+            android:title="@string/throttle_time_frame"
+            android:persistent="false" />
+
+    <Preference
+            android:key="throttle_rate"
+            style="?android:preferenceInformationStyle"
+            android:title="@string/throttle_rate"
+            android:persistent="false" />
+
+    <Preference
+            android:key="throttle_help"
+            android:title="@string/throttle_help"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/fdn_setting.xml b/res/xml/fdn_setting.xml
new file mode 100644
index 0000000..4c62cf5
--- /dev/null
+++ b/res/xml/fdn_setting.xml
@@ -0,0 +1,46 @@
+<?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">
+
+    <!-- Rearranged to use EditPinPreference -->
+    <com.android.phone.EditPinPreference 
+        android:key="button_fdn_enable_key" 
+        android:persistent="false"
+        android:dialogMessage="@string/enter_pin2_text"
+        android:title="@string/fdn_activation"/>
+        
+    <!-- Rearranged to use EditPinPreference -->
+    <com.android.phone.EditPinPreference 
+        android:key="button_change_pin2_key" 
+        android:title="@string/change_pin2"
+        android:dialogTitle="@string/change_pin2"
+        android:summary="@string/sum_fdn_change_pin"
+        android:persistent="false"/>
+        
+    <PreferenceScreen 
+        android:key="button_fdn_list_key" 
+        android:title="@string/manage_fdn_list"
+        android:summary="@string/sum_fdn_manage_list"
+        android:persistent="false">
+        
+        <!-- Intent to lauch the FDN list. -->
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.FdnList" />
+            
+    </PreferenceScreen>
+    
+</PreferenceScreen>
diff --git a/res/xml/gsm_umts_additional_options.xml b/res/xml/gsm_umts_additional_options.xml
new file mode 100644
index 0000000..19ec56b
--- /dev/null
+++ b/res/xml/gsm_umts_additional_options.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
+     android:title="@string/additional_gsm_call_settings">
+
+    <com.android.phone.CLIRListPreference
+        android:key="button_clir_key"
+        android:title="@string/labelCallerId"
+        android:persistent="false"
+        android:defaultValue="DEFAULT"
+        android:entries="@array/clir_display_values"
+        android:entryValues="@array/clir_values"
+        android:dialogTitle="@string/labelCallerId"
+        android:summary="@string/sum_loading_settings"
+        android:enabled="false"/>
+
+    <com.android.phone.CallWaitingCheckBoxPreference
+        android:key="button_cw_key"
+        android:title="@string/labelCW"
+        android:persistent="false"
+        android:summaryOn="@string/sum_cw_enabled"
+        android:summaryOff="@string/sum_cw_disabled"
+        android:enabled="false"/>
+</PreferenceScreen>
diff --git a/res/xml/gsm_umts_call_options.xml b/res/xml/gsm_umts_call_options.xml
new file mode 100644
index 0000000..2f3c235
--- /dev/null
+++ b/res/xml/gsm_umts_call_options.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
+     android:title="@string/labelGSMMore">
+
+    <PreferenceScreen
+        android:key="button_cf_expand_key"
+        android:title="@string/labelCF"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.GsmUmtsCallForwardOptions"/>
+    </PreferenceScreen>
+
+    <PreferenceScreen
+        android:key="button_more_expand_key"
+        android:title="@string/additional_gsm_call_settings"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.GsmUmtsAdditionalCallOptions"/>
+    </PreferenceScreen>
+</PreferenceScreen>
diff --git a/res/xml/gsm_umts_options.xml b/res/xml/gsm_umts_options.xml
new file mode 100644
index 0000000..afdd0d3
--- /dev/null
+++ b/res/xml/gsm_umts_options.xml
@@ -0,0 +1,49 @@
+<?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.phone">
+
+    <PreferenceScreen
+        android:key="button_apn_key"
+        android:title="@string/apn_settings"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.ApnSettings" />
+
+    </PreferenceScreen>
+
+    <com.android.phone.Use2GOnlyCheckBoxPreference
+        android:key="button_prefer_2g_key"
+        android:title="@string/prefer_2g"
+        android:persistent="false"
+        android:summary="@string/prefer_2g_summary"/>
+
+    <PreferenceScreen
+        android:key="button_carrier_sel_key"
+        android:title="@string/networks"
+        android:summary="@string/sum_carrier_select"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.phone"
+            android:targetClass="com.android.phone.NetworkSetting" />
+
+    </PreferenceScreen>
+
+</PreferenceScreen>
diff --git a/res/xml/network_setting.xml b/res/xml/network_setting.xml
new file mode 100644
index 0000000..7fd00fc
--- /dev/null
+++ b/res/xml/network_setting.xml
@@ -0,0 +1,46 @@
+<?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:phone="http://schemas.android.com/apk/res/com.android.phone"
+        android:title="@string/mobile_networks">
+
+    <PreferenceScreen
+        android:key="cdma_lte_data_service_key"
+        android:title="@string/cdma_lte_data_service">
+    </PreferenceScreen>
+
+    <CheckBoxPreference
+        android:key="button_data_enabled_key"
+        android:title="@string/data_enabled"
+        android:persistent="false"
+        android:summary="@string/data_enable_summary"/>
+
+    <CheckBoxPreference
+        android:key="button_roaming_key"
+        android:title="@string/roaming"
+        android:persistent="false"
+        android:summaryOn="@string/roaming_enable"
+        android:summaryOff="@string/roaming_disable"/>
+
+    <ListPreference
+        android:key="preferred_network_mode_key"
+        android:title="@string/preferred_network_mode_title"
+        android:summary="@string/preferred_network_mode_summary"
+        android:entries="@array/preferred_network_mode_choices"
+        android:entryValues="@array/preferred_network_mode_values"
+        android:dialogTitle="@string/preferred_network_mode_dialogtitle" />
+
+</PreferenceScreen>
diff --git a/res/xml/respond_via_sms_settings.xml b/res/xml/respond_via_sms_settings.xml
new file mode 100644
index 0000000..739673c
--- /dev/null
+++ b/res/xml/respond_via_sms_settings.xml
@@ -0,0 +1,58 @@
+<?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.
+-->
+
+<!-- Settings screen that lets the user manage the canned responses
+     for the "Respond via SMS" feature; see RespondViaSmsManager.java -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+     android:title="@string/respond_via_sms_setting_title_2">
+
+    <!-- Ultra-simple implementation for now: just provide 4 fixed slots
+         with customizable strings. -->
+
+    <!-- TODO: Potential UI improvements:
+         (1) Allow editing the strings in place, rather than having to tap
+             each one and edit it via the popup dialog.
+         (2) Allow reordering the strings by drag-and-drop.
+         (3) Provide an "Add new string..." option? -->
+
+    <!-- The defaultValues here must agree with the values used with
+         prefs.getString() in RespondViaSmsManager.loadCannedResponses(). -->
+
+    <!-- Use MultiLineTitleEditTextPreference instead of the standard
+         EditTextPreference here, to allow the preference "title" to wrap
+         onto multiple lines if the customized messages are long enough. -->
+
+    <com.android.phone.MultiLineTitleEditTextPreference
+        android:key="canned_response_pref_1"
+        android:defaultValue="@string/respond_via_sms_canned_response_1"
+        android:dialogTitle="@string/respond_via_sms_edittext_dialog_title" />
+
+    <com.android.phone.MultiLineTitleEditTextPreference
+        android:key="canned_response_pref_2"
+        android:defaultValue="@string/respond_via_sms_canned_response_2"
+        android:dialogTitle="@string/respond_via_sms_edittext_dialog_title" />
+
+    <com.android.phone.MultiLineTitleEditTextPreference
+        android:key="canned_response_pref_3"
+        android:defaultValue="@string/respond_via_sms_canned_response_3"
+        android:dialogTitle="@string/respond_via_sms_edittext_dialog_title" />
+
+    <com.android.phone.MultiLineTitleEditTextPreference
+        android:key="canned_response_pref_4"
+        android:defaultValue="@string/respond_via_sms_canned_response_4"
+        android:dialogTitle="@string/respond_via_sms_edittext_dialog_title" />
+
+</PreferenceScreen>
diff --git a/res/xml/sip_advanced_edit.xml b/res/xml/sip_advanced_edit.xml
new file mode 100644
index 0000000..b7974ba
--- /dev/null
+++ b/res/xml/sip_advanced_edit.xml
@@ -0,0 +1,74 @@
+<?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:persistent="false">
+
+    <PreferenceCategory
+        android:key="@string/advanced_settings_container"
+        android:persistent="false">
+
+        <EditTextPreference
+            android:key="@string/auth_username"
+            android:title="@string/auth_username_title"
+            android:dialogTitle="@string/auth_username_title"
+            android:summary="@string/auth_username_summary"
+            android:persistent="false"
+            android:singleLine="true"/>
+
+        <EditTextPreference
+            android:key="@string/display_name"
+            android:title="@string/display_name_title"
+            android:dialogTitle="@string/display_name_title"
+            android:summary="@string/display_name_summary"
+            android:persistent="false"
+            android:singleLine="true"/>
+
+        <EditTextPreference
+            android:key="@string/proxy_address"
+            android:title="@string/proxy_address_title"
+            android:dialogTitle="@string/proxy_address_title"
+            android:summary="@string/optional_summary"
+            android:persistent="false"
+            android:singleLine="true"/>
+
+        <EditTextPreference
+            android:key="@string/port"
+            android:title="@string/port_title"
+            android:summary="@string/default_port"
+            android:dialogTitle="@string/port_title"
+            android:persistent="false"
+            android:inputType="number|numberDecimal"
+            android:singleLine="true"/>
+
+        <ListPreference
+            android:key="@string/transport"
+            android:title="@string/transport_title"
+            android:entries="@array/transport_types"
+            android:entryValues="@array/transport_types"
+            android:summary="@string/default_transport"
+            android:persistent="false"
+            android:dialogTitle="@string/transport_title"/>
+
+        <ListPreference
+            android:key="@string/send_keepalive"
+            android:title="@string/send_keepalive_title"
+            android:entries="@array/sip_send_keepalive_options"
+            android:entryValues="@array/sip_send_keepalive_options"
+            android:persistent="false"
+            android:summary="@string/sip_system_decide"/>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/sip_edit.xml b/res/xml/sip_edit.xml
new file mode 100644
index 0000000..f091fc1
--- /dev/null
+++ b/res/xml/sip_edit.xml
@@ -0,0 +1,59 @@
+<?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/sip_edit_title"
+        android:persistent="false">
+
+    <EditTextPreference
+        android:key="@string/username"
+        android:title="@string/username_title"
+        android:dialogTitle="@string/username_title"
+        android:summary="@string/default_preference_summary"
+        android:persistent="false"
+        android:singleLine="true"
+        android:inputType="textNoSuggestions"/>
+
+    <EditTextPreference
+        android:key="@string/password"
+        android:title="@string/password_title"
+        android:dialogTitle="@string/password_title"
+        android:password="true"
+        android:summary="@string/default_preference_summary"
+        android:persistent="false"
+        android:singleLine="true"/>
+
+    <EditTextPreference
+        android:key="@string/domain_address"
+        android:title="@string/domain_address_title"
+        android:dialogTitle="@string/domain_address_title"
+        android:summary="@string/default_preference_summary"
+        android:persistent="false"
+        android:singleLine="true"
+        android:inputType="textNoSuggestions"/>
+
+    <CheckBoxPreference
+        android:key="@string/set_primary"
+        android:title="@string/set_primary_title"
+        android:persistent="false"
+        android:summary="@string/set_primary_summary"/>
+
+    <PreferenceScreen
+        android:key="@string/advanced_settings"
+        android:title="@string/advanced_settings"
+        android:summary="@string/advanced_settings_show"
+        android:persistent="false"/>
+</PreferenceScreen>
diff --git a/res/xml/sip_setting.xml b/res/xml/sip_setting.xml
new file mode 100644
index 0000000..c754404
--- /dev/null
+++ b/res/xml/sip_setting.xml
@@ -0,0 +1,26 @@
+<?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/sip_accounts">
+
+    <CheckBoxPreference
+            android:key="sip_receive_calls_key"
+            android:title="@string/sip_receive_calls"
+            android:summary="@string/sip_receive_calls_summary"
+            android:persistent="true"/>
+
+    <PreferenceCategory android:key="sip_account_list" android:title="@string/sip_account_list"/>
+</PreferenceScreen>
diff --git a/res/xml/sip_settings_category.xml b/res/xml/sip_settings_category.xml
new file mode 100644
index 0000000..e857be6
--- /dev/null
+++ b/res/xml/sip_settings_category.xml
@@ -0,0 +1,48 @@
+<?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"
+    xmlns:phone="http://schemas.android.com/apk/res/com.android.phone">
+    <PreferenceCategory
+            android:key="sip_settings_category_key"
+            android:title="@string/sip_settings"
+            android:persistent="false">
+
+        <PreferenceScreen
+                android:key="sip_account_settings_key"
+                android:title="@string/sip_accounts_title"
+                android:persistent="false">
+
+            <intent android:action="android.intent.action.MAIN"
+                    android:targetPackage="com.android.phone"
+                    android:targetClass="com.android.phone.sip.SipSettings" />
+        </PreferenceScreen>
+
+        <ListPreference
+                android:key="sip_call_options_key"
+                android:title="@string/sip_call_options_title"
+                android:persistent="true"
+                android:entries="@array/sip_call_options_entries"
+                android:entryValues="@array/sip_call_options_values"/>
+
+        <ListPreference
+                android:key="sip_call_options_wifi_only_key"
+                android:title="@string/sip_call_options_title"
+                android:dialogTitle="@string/sip_call_options_wifi_only_title"
+                android:persistent="true"
+                android:entries="@array/sip_call_options_wifi_only_entries"
+                android:entryValues="@array/sip_call_options_values"/>
+    </PreferenceCategory>
+</PreferenceScreen>