summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-10-27 14:43:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-27 14:43:39 -0700
commit79b7fdd2c0682f59f3a0899041b470cc02154219 (patch)
treedf11003a8f0f41485239666dd97459e2be5af015 /res/xml
parent381df27cd69c9c7315556c1dc40403118f7c585a (diff)
parente00cd9ff60ee5c5769902c0e1d85764d17eccc03 (diff)
downloadpackages_apps_settings-79b7fdd2c0682f59f3a0899041b470cc02154219.zip
packages_apps_settings-79b7fdd2c0682f59f3a0899041b470cc02154219.tar.gz
packages_apps_settings-79b7fdd2c0682f59f3a0899041b470cc02154219.tar.bz2
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/sound_settings.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index dda596a..26e2e20 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -96,7 +96,13 @@
<!-- Do not nest these, or removals in code will break -->
<PreferenceScreen
android:key="dock_audio"
- android:title="@string/dock_audio_settings_title" />
+ android:title="@string/dock_audio_settings_title">
+ <CheckBoxPreference
+ android:title="@string/bluetooth_dock_settings_a2dp"
+ android:key="dock_audio_media_enabled"
+ android:enabled="true"
+ />
+ </PreferenceScreen>
<CheckBoxPreference
android:key="dock_sounds"