diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-08-13 22:52:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | f51dacedd8ccbe99584e05320a92adbb8e95abfe (patch) | |
| tree | 197c428aed01bb4a6bc30730670bc5c4e4c0f577 /res/values | |
| parent | bf55863b41efc3ad29c752f133f8739aac35d103 (diff) | |
| parent | ca54234efc0fe8fe2d36a1fb465a153ed0ca0cf8 (diff) | |
| download | packages_apps_Settings-f51dacedd8ccbe99584e05320a92adbb8e95abfe.zip packages_apps_Settings-f51dacedd8ccbe99584e05320a92adbb8e95abfe.tar.gz packages_apps_Settings-f51dacedd8ccbe99584e05320a92adbb8e95abfe.tar.bz2 | |
Merge "Add setting to disable automatic USB audio routing" into lmp-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 554ffea..f410357 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4761,6 +4761,11 @@ <!-- UI debug setting: force use of NuPlayer summary [CHAR LIMIT=50] --> <string name="use_nuplayer_summary">Use NuPlayer instead of AwesomePlayer</string> + <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=25] --> + <string name="usb_audio_disable_routing">Disable USB audio routing</string> + <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] --> + <string name="usb_audio_disable_routing_summary">Disable automatic routing to USB audio peripherals</string> + <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] --> <string name="debug_layout">Show layout bounds</string> <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] --> |