summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-06-12 16:30:45 -0700
committerNick Kralevich <nnk@google.com>2015-06-12 16:30:45 -0700
commit9cff8cdfe0fcc18af32591052cb8263cbe95c5cd (patch)
tree2c436e7d0ba909a700d5027785b5b8686342d11f /res
parentda6e4c47aa0e4319ada376d2917aafb2c2c27734 (diff)
downloadpackages_apps_Settings-9cff8cdfe0fcc18af32591052cb8263cbe95c5cd.zip
packages_apps_Settings-9cff8cdfe0fcc18af32591052cb8263cbe95c5cd.tar.gz
packages_apps_Settings-9cff8cdfe0fcc18af32591052cb8263cbe95c5cd.tar.bz2
Fix bad USB configuration under Developer Options
The USB configuration screen under Developer Options hasn't been updated for the new USB access control changes. Update it. 1) Ensure that the default in Development Settings is "Charger Only". 2) Changing USB mode in developer settings only changes the USB function. It doesn't unlock any USB data. Bug: 21258972 Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml3
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>