Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c7c6bbac: am f2bd9017: make vpn type strings i18n ready.

Browse Source 
Merge commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40'

* commit 'c7c6bbacb84bcd8f485758ce2031ec320e179b40':
  make vpn type strings i18n ready.
This commit is contained in:
Hung-ying Tyan
2009-10-01 11:54:58 -07:00
committed by Android Git Automerger
parent 7b81fe7773 c7c6bbacb8
commit 3222f7a3a0
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/res/values/strings.xml
View File

@@ -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>

22
vpn/java/android/net/vpn/VpnType.java
View File

@@ -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() {