summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-10-29 19:34:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 19:34:49 -0700
commit8b643d946222119cf15b0d5d9d9cf7cd4fe019c1 (patch)
tree71ed25538fe6a1693b8522f35c84da72f64f4a8e /res
parenta8a974bd171ccbc3b35b18c3e73a23d22834d05e (diff)
parent0cb3743e93aef81e7669f1e6c81184559e0f8154 (diff)
downloadpackages_apps_settings-8b643d946222119cf15b0d5d9d9cf7cd4fe019c1.zip
packages_apps_settings-8b643d946222119cf15b0d5d9d9cf7cd4fe019c1.tar.gz
packages_apps_settings-8b643d946222119cf15b0d5d9d9cf7cd4fe019c1.tar.bz2
am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-mr2 * commit '0cb3743e93aef81e7669f1e6c81184559e0f8154': b/2219381 Gray out Bluetooth Settings for the emulator
Diffstat (limited to 'res')
-rw-r--r--res/xml/wireless_settings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 9110ced..1bb55ef 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -48,6 +48,7 @@
android:dependency="toggle_airplane" />
<PreferenceScreen
+ android:key="bt_settings"
android:title="@string/bluetooth_settings_title"
android:summary="@string/bluetooth_settings_summary"
android:dependency="toggle_airplane">