diff options
| author | Nick Kralevich <nnk@google.com> | 2015-06-13 03:12:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-13 03:12:08 +0000 |
| commit | 64a8032f44da51d0422cb52af4631c7ae2545731 (patch) | |
| tree | 1b48c2c8c9865b2de1a23db66d887c89e046d7e8 /res | |
| parent | 97d102d9e207f3379ef94929e239de848c784754 (diff) | |
| parent | 9cff8cdfe0fcc18af32591052cb8263cbe95c5cd (diff) | |
| download | packages_apps_Settings-64a8032f44da51d0422cb52af4631c7ae2545731.zip packages_apps_Settings-64a8032f44da51d0422cb52af4631c7ae2545731.tar.gz packages_apps_Settings-64a8032f44da51d0422cb52af4631c7ae2545731.tar.bz2 | |
Merge "Fix bad USB configuration under Developer Options" into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 23d0582..6c1f68b 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1329,6 +1329,7 @@ <!-- USB configuration names for Developer Settings. This can be overridden by devices with additional USB configurations. --> <string-array name="usb_configuration_titles"> + <item>@string/usb_use_charging_only</item> <item>MTP (Media Transfer Protocol)</item> <item>PTP (Picture Transfer Protocol)</item> <item>RNDIS (USB Ethernet)</item> @@ -1342,6 +1343,8 @@ Do not translate. --> <string-array name="usb_configuration_values" translatable="false"> <!-- Do not translate. --> + <item>none</item> + <!-- Do not translate. --> <item>mtp</item> <!-- Do not translate. --> <item>ptp</item> |