summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-10-29 17:55:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 17:55:04 -0700
commit527068fed89da9d89d479180bbb97a7bfbe50b16 (patch)
treedb3dd149eb38053a2b6845a79c36a44c60938426 /res
parent59103bde509a01499283eeb3f3494c4b2ad5596e (diff)
parent0cb3743e93aef81e7669f1e6c81184559e0f8154 (diff)
downloadpackages_apps_Settings-527068fed89da9d89d479180bbb97a7bfbe50b16.zip
packages_apps_Settings-527068fed89da9d89d479180bbb97a7bfbe50b16.tar.gz
packages_apps_Settings-527068fed89da9d89d479180bbb97a7bfbe50b16.tar.bz2
am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulator
Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp * 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">