diff options
| -rw-r--r-- | core/res/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | vpn/java/android/net/vpn/VpnType.java | 22 |
2 files changed, 19 insertions, 8 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 0ff537d..7191a46 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2088,4 +2088,9 @@ <!-- Do Not Translate: Alternate eri.xml --> <string name="alternate_eri_file">/data/eri.xml</string> + + <string name="pptp_vpn_description">Point-to-Point Tunneling Protocol</string> + <string name="l2tp_vpn_description">Layer 2 Tunneling Protocol</string> + <string name="l2tp_ipsec_psk_vpn_description">Pre-shared key based L2TP/IPSec VPN</string> + <string name="l2tp_ipsec_crt_vpn_description">Certificate based L2TP/IPSec VPN</string> </resources> diff --git a/vpn/java/android/net/vpn/VpnType.java b/vpn/java/android/net/vpn/VpnType.java index c7df943..322f2bf 100644 --- a/vpn/java/android/net/vpn/VpnType.java +++ b/vpn/java/android/net/vpn/VpnType.java @@ -16,26 +16,28 @@ package android.net.vpn; +import com.android.internal.R; + /** * Enumeration of all supported VPN types. * {@hide} */ public enum VpnType { - PPTP("PPTP", "", PptpProfile.class), - L2TP("L2TP", "", L2tpProfile.class), - L2TP_IPSEC_PSK("L2TP/IPSec PSK", "Pre-shared key based L2TP/IPSec VPN", + PPTP("PPTP", R.string.pptp_vpn_description, PptpProfile.class), + L2TP("L2TP", R.string.l2tp_vpn_description, L2tpProfile.class), + L2TP_IPSEC_PSK("L2TP/IPSec PSK", R.string.l2tp_ipsec_psk_vpn_description, L2tpIpsecPskProfile.class), - L2TP_IPSEC("L2TP/IPSec CRT", "Certificate based L2TP/IPSec VPN", + L2TP_IPSEC("L2TP/IPSec CRT", R.string.l2tp_ipsec_crt_vpn_description, L2tpIpsecProfile.class); private String mDisplayName; - private String mDescription; + private int mDescriptionId; private Class<? extends VpnProfile> mClass; - VpnType(String displayName, String description, + VpnType(String displayName, int descriptionId, Class<? extends VpnProfile> klass) { mDisplayName = displayName; - mDescription = description; + mDescriptionId = descriptionId; mClass = klass; } @@ -43,8 +45,12 @@ public enum VpnType { return mDisplayName; } + public int getDescriptionId() { + return mDescriptionId; + } + public String getDescription() { - return mDescription; + return ""; } public Class<? extends VpnProfile> getProfileClass() { |