commit abc48f80d8747b4fc051b7dd364355ee667a9bac
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:06:01 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:06:01 2008 -0800
tree 31ae577fe29d75963b071e738703e4db83ad6580
parent de2d9f5f109265873196f1615e1f3546b114aaa7

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

res/xml/bluetooth_settings.xml

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>