summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-09-04 17:50:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-04 17:50:00 +0000
commit0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7 (patch)
treee3b82176e1e1a438283aacadd795b681c17fd095 /res/xml
parent92de681ec31315bc0fd3deacf8166b2ba45cdbb1 (diff)
parente32220eedc7b369b439bb899fd9509966a68a223 (diff)
downloadpackages_apps_Settings-0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7.zip
packages_apps_Settings-0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7.tar.gz
packages_apps_Settings-0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7.tar.bz2
Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/device_picker.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml
index 9fef34d..fd043a2 100644
--- a/res/xml/device_picker.xml
+++ b/res/xml/device_picker.xml
@@ -17,13 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
- <Preference
- android:key="bt_scan"
- android:title="@string/bluetooth_preference_scan_title" />
-
<com.android.settings.bluetooth.BluetoothProgressCategory
android:key="bt_device_list"
- android:title="@string/bluetooth_preference_found_devices"
android:orderingFromXml="false" />
</PreferenceScreen>