am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread

* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
  Support configuring the protocol in APN settings.
This commit is contained in:
Lorenzo Colitti
2011-03-03 17:07:39 -08:00
committed by Android Git Automerger
4 changed files with 74 additions and 1 deletions

View File

@@ -354,6 +354,22 @@
<item>3</item>
</string-array>
<!-- Authentication Types used in APN editor -->
<string-array name="apn_protocol_entries">
<item>IPv4</item>
<item>IPv6</item>
<item>IPv4/IPv6</item>
</string-array>
<string-array translatable="false" name="apn_protocol_values">
<!-- Do not translate. -->
<item>IP</item>
<!-- Do not translate. -->
<item>IPV6</item>
<!-- Do not translate. -->
<item>IPV4V6</item>
</string-array>
<!-- Apps on SD instalaltion location options in ApplicationSettings -->
<string-array name="app_install_location_entries">
<item>Internal device storage</item>

View File

@@ -1399,6 +1399,8 @@
<string name="apn_auth_type_pap_chap">PAP or CHAP</string>
<!-- Edit access point labels: The type of APN -->
<string name="apn_type">APN type</string>
<!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
<string name="apn_protocol">APN protocol</string>
<!-- Edit access point screen menu option to delete this APN -->
<string name="menu_delete">Delete APN</string>
<!-- APNs screen menu option to create a brand spanking new APN -->