diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-06-26 19:17:14 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2011-06-26 19:25:59 -0700 |
| commit | 310d619acba5cd1f7c8a55aa7906ed4f1c011bd8 (patch) | |
| tree | a5208fe8f101756a035ed8666cedc5d2e679080c /res/values/arrays.xml | |
| parent | 827fde31e8f580f682d86a0e83b5700f602e4bbc (diff) | |
| download | packages_apps_Settings-310d619acba5cd1f7c8a55aa7906ed4f1c011bd8.zip packages_apps_Settings-310d619acba5cd1f7c8a55aa7906ed4f1c011bd8.tar.gz packages_apps_Settings-310d619acba5cd1f7c8a55aa7906ed4f1c011bd8.tar.bz2 | |
Settings: revise VpnSettings.
Make the style closer to other settings.
Profiles are saved in KeyStore with optional account information.
Not adapt to IConnectivityManager yet.
Change-Id: I9d7a0c14b253a0b355499c5e558b0761fa24ea22
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3f2fc23..c0578fa 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -612,5 +612,39 @@ <item>Use HDCP checking for DRM content only</item> <item>Always use HDCP checking</item> </string-array> -</resources> + <!-- Match this with the constants in VpnProfile. --> <skip /> + <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] --> + <string-array name="vpn_types" translatable="false"> + <item>PPTP</item> + <item>L2TP/IPSec PSK</item> + <item>L2TP/IPSec RSA</item> + <item>IPSec Xauth PSK</item> + <item>IPSec Xauth RSA</item> + <item>IPSec Hybrid RSA</item> + </string-array> + + <!-- Match this with the constants in VpnProfile. --> <skip /> + <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] --> + <string-array name="vpn_types_long"> + <item>PPTP VPN</item> + <item>L2TP/IPSec VPN with pre-shared keys</item> + <item>L2TP/IPSec VPN with certificates</item> + <item>IPSec VPN with pre-shared keys and Xauth authentication</item> + <item>IPSec VPN with certificates and Xauth authentication</item> + <item>IPSec VPN with certificates and hybrid authentication</item> + </string-array> + + <!-- Match this with the constants in VpnProfile. --> <skip /> + <!-- Status for a VPN network. [CHAR LIMIT=100] --> + <string-array name="vpn_states"> + <!-- Status message when VPN is connecting. --> + <item>Connecting\u2026</item> + <!-- Status message when VPN is connected. --> + <item>Connected</item> + <!-- Status message when VPN is disconnected. --> + <item>Disconnected</item> + <!-- Status message when VPN failed to connect. --> + <item>Failed</item> + </string-array> +</resources> |