diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-10-26 13:44:33 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2010-10-27 16:23:05 -0700 |
| commit | 48e90002839e662eb1667471aebeb0483e9fb7db (patch) | |
| tree | ccb7200c9703f977e52cdc74538e9483ec33299a /res/xml | |
| parent | 4a5f889f80b683446e498f244d0eadfd979ca5d0 (diff) | |
| download | packages_apps_settings-48e90002839e662eb1667471aebeb0483e9fb7db.zip packages_apps_settings-48e90002839e662eb1667471aebeb0483e9fb7db.tar.gz packages_apps_settings-48e90002839e662eb1667471aebeb0483e9fb7db.tar.bz2 | |
Bluetooth settings revamp
Added a separate scanning screen.
UI changes to not require long-press options.
Needs TODOs to be filled by BT team.
Bug: 3038327
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/bluetooth_device_advanced.xml | 27 | ||||
| -rw-r--r-- | res/xml/bluetooth_settings.xml | 18 | ||||
| -rw-r--r-- | res/xml/device_picker.xml | 2 |
3 files changed, 34 insertions, 13 deletions
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml index 5611595..b4a0978 100644 --- a/res/xml/bluetooth_device_advanced.xml +++ b/res/xml/bluetooth_device_advanced.xml @@ -18,15 +18,32 @@ xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory - android:key="title" /> - + android:key="title" + android:order="10" + android:title="@string/bluetooth_device_advanced_device_actions_title" /> + + <EditTextPreference + android:key="rename_device" + android:title="@string/bluetooth_device_advanced_rename_device" + android:order="20" + android:persistent="false" /> + <CheckBoxPreference - android:key="online_mode" - android:title="@string/bluetooth_device_advanced_online_mode_title" + android:key="allow_incoming" + android:title="@string/bluetooth_device_advanced_enable_opp_title" + android:order="30" android:persistent="false" /> - + + <Preference + android:key="unpair" + android:title="@string/bluetooth_device_context_unpair" + android:order="40" + android:persistent="false" + /> + <PreferenceCategory android:key="profile_container" + android:order="100" android:title="@string/bluetooth_device_advanced_profile_header_title"> <!-- Profile checkboxes will be added here programmatically. --> diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml index 131f7a0..b7a0edc 100644 --- a/res/xml/bluetooth_settings.xml +++ b/res/xml/bluetooth_settings.xml @@ -18,6 +18,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/bluetooth_settings" > + <PreferenceCategory + android:title="@string/bluetooth_preference_device_settings"/> + <CheckBoxPreference android:key="bt_checkbox" android:title="@string/bluetooth" @@ -40,15 +43,16 @@ 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 + <PreferenceCategory android:key="bt_device_list" - android:title="@string/bluetooth_devices" + android:title="@string/bluetooth_preference_paired_devices" android:dependency="bt_checkbox" android:orderingFromXml="false" /> + <Preference + android:key="bt_find_nearby" + android:dependency="bt_checkbox" + android:fragment="com.android.settings.bluetooth.BluetoothSettings$FindNearby" + android:title="@string/bluetooth_preference_find_nearby_title" /> + </PreferenceScreen> diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml index 7dd5b68..43b5829 100644 --- a/res/xml/device_picker.xml +++ b/res/xml/device_picker.xml @@ -23,7 +23,7 @@ <com.android.settings.ProgressCategory android:key="bt_device_list" - android:title="@string/bluetooth_devices" + android:title="@string/bluetooth_preference_found_devices" android:orderingFromXml="false" /> </PreferenceScreen> |