am 539d7c66: am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev

* commit '539d7c66d624107816c62184ebd6eaede3715ac5':
  added dock audio settings for non bluetooth docks
This commit is contained in:
Eric Laurent
2012-10-29 17:15:51 -07:00
committed by Android Git Automerger
2 changed files with 62 additions and 20 deletions

View File

@@ -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"