diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 20:44:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 20:44:44 -0700 |
| commit | 423ab2eb9df5e2866ecb1f5f975f2f7a660d334f (patch) | |
| tree | 2780bbf1b4e088ef97f06388e484c091a66ed5f5 /src/com/android/settings | |
| parent | 879f7bcf41782940fff3ffcb3586d606361360c6 (diff) | |
| parent | 33ababd1bdb651d32952536e6d5e72750d1f4cc9 (diff) | |
| download | packages_apps_Settings-423ab2eb9df5e2866ecb1f5f975f2f7a660d334f.zip packages_apps_Settings-423ab2eb9df5e2866ecb1f5f975f2f7a660d334f.tar.gz packages_apps_Settings-423ab2eb9df5e2866ecb1f5f975f2f7a660d334f.tar.bz2 | |
Merge change 6328 into donut
* changes:
String fixes for the credential storage and vpn settings.
Diffstat (limited to 'src/com/android/settings')
5 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java index af9875c..286064f 100644 --- a/src/com/android/settings/vpn/AuthenticationActor.java +++ b/src/com/android/settings/vpn/AuthenticationActor.java @@ -70,9 +70,9 @@ public class AuthenticationActor implements VpnProfileActor { TextView passwordView = (TextView) d.findViewById(R.id.password_value); Context c = mContext; if (TextUtils.isEmpty(usernameView.getText().toString())) { - return c.getString(R.string.vpn_username); + return c.getString(R.string.vpn_a_username); } else if (TextUtils.isEmpty(passwordView.getText().toString())) { - return c.getString(R.string.vpn_password); + return c.getString(R.string.vpn_a_password); } else { return null; } diff --git a/src/com/android/settings/vpn/L2tpEditor.java b/src/com/android/settings/vpn/L2tpEditor.java index c518dec..643ba3b 100644 --- a/src/com/android/settings/vpn/L2tpEditor.java +++ b/src/com/android/settings/vpn/L2tpEditor.java @@ -57,7 +57,7 @@ class L2tpEditor extends VpnProfileEditor { return ((result != null) ? result - : validate(mSecretString, R.string.vpn_l2tp_secret)); + : validate(mSecretString, R.string.vpn_a_l2tp_secret)); } private Preference createSecretPreference(Context c) { diff --git a/src/com/android/settings/vpn/L2tpIpsecEditor.java b/src/com/android/settings/vpn/L2tpIpsecEditor.java index b6b244f..b14feb3 100644 --- a/src/com/android/settings/vpn/L2tpIpsecEditor.java +++ b/src/com/android/settings/vpn/L2tpIpsecEditor.java @@ -55,10 +55,10 @@ class L2tpIpsecEditor extends L2tpEditor { public String validate() { String result = super.validate(); if (result == null) { - result = validate(mUserCertificate, R.string.vpn_user_certificate); + result = validate(mUserCertificate, R.string.vpn_a_user_certificate); } if (result == null) { - result = validate(mCaCertificate, R.string.vpn_ca_certificate); + result = validate(mCaCertificate, R.string.vpn_a_ca_certificate); } return result; } diff --git a/src/com/android/settings/vpn/L2tpIpsecPskEditor.java b/src/com/android/settings/vpn/L2tpIpsecPskEditor.java index fb67c98..11590da 100644 --- a/src/com/android/settings/vpn/L2tpIpsecPskEditor.java +++ b/src/com/android/settings/vpn/L2tpIpsecPskEditor.java @@ -47,7 +47,7 @@ class L2tpIpsecPskEditor extends L2tpEditor { return ((result != null) ? result - : validate(mPresharedKey, R.string.vpn_ipsec_presharedkey)); + : validate(mPresharedKey, R.string.vpn_a_ipsec_presharedkey)); } private Preference createPresharedKeyPreference(Context c) { diff --git a/src/com/android/settings/vpn/VpnProfileEditor.java b/src/com/android/settings/vpn/VpnProfileEditor.java index a708a8c..a1cdc76 100644 --- a/src/com/android/settings/vpn/VpnProfileEditor.java +++ b/src/com/android/settings/vpn/VpnProfileEditor.java @@ -85,10 +85,10 @@ class VpnProfileEditor { * null if all the inputs are valid */ public String validate() { - String result = validate(mName, R.string.vpn_name); + String result = validate(mName, R.string.vpn_a_name); return ((result != null) ? result - : validate(mServerName, R.string.vpn_vpn_server)); + : validate(mServerName, R.string.vpn_a_vpn_server)); } /** |