Code drop from //branches/cupcake/...@124589

12 files changed, 139 insertions, 28 deletions

diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 832adb2..c4f2bd0 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -30,6 +30,7 @@
             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"
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
new file mode 100644
index 0000000..5611595
--- /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
index 83fb142..8449343 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -14,33 +14,43 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
-        android:title="@string/bluetooth_settings"/>
+        android:title="@string/bluetooth_settings" />
 
-    <CheckBoxPreference android:key="bt_checkbox"
-        android:title="@string/bluetooth" 
-        android:summaryOff="@string/bluetooth_disabled"
-        android:summaryOn="@string/bluetooth_enabled"
-        />
+    <CheckBoxPreference
+        android:key="bt_checkbox"
+        android:title="@string/bluetooth"
+        android:summary="@string/bluetooth_quick_toggle_summary" />
 
-    <CheckBoxPreference android:key="bt_visibility"
-        android:title="@string/bluetooth_visibility" 
-        android:dependency="bt_checkbox"
-        android:summaryOn="@string/bluetooth_is_discoverable"
-        android:summaryOff="@string/bluetooth_not_discoverable"
-        android:persistent="false"
-        />
-        
-    <EditTextPreference android:key="bt_name"
+    <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:singleLine="true"/>
-    <com.android.settings.ProgressCategory 
-        android:key="bt_device_list" 
+        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:dependency="bt_checkbox"
+        android:orderingFromXml="false" />
+
 </PreferenceScreen>
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 641030f..47e047a 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -35,8 +35,8 @@
         />
     <CheckBoxPreference android:key="24 hour" 
         android:title="@string/date_time_24hour"
-        android:summaryOn="13:00"
-        android:summaryOff="1:00 pm"/>
+        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" 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index c64f07a..286497e 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -29,4 +29,9 @@
         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_settings.xml b/res/xml/device_info_settings.xml
index c39d51e..07716da 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -17,6 +17,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory 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" 
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index da4cdca..8fc75cd 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/device_status"/>
+    <PreferenceCategory android:title="@string/device_status_activity_title"/>
     
     <Preference android:key="battery_status" 
         style="?android:attr/preferenceInformationStyle" 
diff --git a/res/xml/input_methods_prefs.xml b/res/xml/input_methods_prefs.xml
new file mode 100644
index 0000000..b8a415f
--- /dev/null
+++ b/res/xml/input_methods_prefs.xml
@@ -0,0 +1,23 @@
+<?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">
+    <PreferenceCategory
+        android:title="@string/input_methods_settings_title" />
+
+</PreferenceScreen>
diff --git a/res/xml/ip_settings.xml b/res/xml/ip_settings.xml
index 3c958a8..e5a2b95 100644
--- a/res/xml/ip_settings.xml
+++ b/res/xml/ip_settings.xml
@@ -17,6 +17,22 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
+            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"
+            />
+    
+    <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"
             />
     
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 5d3010c..78b61aa 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -21,11 +21,10 @@
             android:key="language_category"
             android:title="@string/language_category">
      <!--
-    <ListPreference
+        <ListPreference
             android:title="@string/phone_language"/>
       --> 
             
-    
         <PreferenceScreen
                 android:title="@string/phone_language">
             <intent android:action="android.intent.action.MAIN"
@@ -36,6 +35,13 @@
     
     <PreferenceCategory
             android:title="@string/text_category" />
+    <PreferenceScreen 
+            android:title="@string/input_methods_settings_title" 
+            android:summary="@string/input_methods_settings_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.InputMethodsSettings" />
+    </PreferenceScreen>
     <CheckBoxPreference
             android:key="auto_replace"
             android:title="@string/auto_replace"
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 065f50b..709f89b 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -27,7 +27,7 @@
                 android:persistent="false"
                 android:disableDependentsState="true" />
     
-        <VolumePreference
+        <com.android.settings.RingerVolumePreference
                 android:key="ring_volume"
                 android:title="@string/ring_volume_title"
                 android:summary="@string/ring_volume_summary"
@@ -42,7 +42,6 @@
                 android:summary="@string/media_volume_summary"
                 android:dialogTitle="@string/media_volume_title"
                 android:persistent="false"
-                android:dependency="silent"
                 android:streamType="music" />
     
         <com.android.settings.DefaultRingtonePreference
@@ -90,6 +89,14 @@
 
     <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"
+                android:dependency="silent" />
+
     
         <com.android.settings.BrightnessPreference
                 android:key="brightness"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 555a570..5cef5e9 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -51,7 +51,7 @@
                     <intent
                         android:action="android.intent.action.MAIN"
                         android:targetPackage="com.android.settings"
-                        android:targetClass="com.android.settings.BluetoothSettings" />
+                        android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
                 </PreferenceScreen>
 
                 <CheckBoxPreference