PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "VpnSettings: pass certificates to racoon directly."

Browse Source
This commit is contained in:
Chia-chi Yeh
2011-07-07 14:29:12 -07:00
committed by Android (Google) Code Review
parent 722934dbbc 413b171159
commit 78c603747e
6 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3456,7 +3456,7 @@ found in the list of installed applications.</string>
<!-- Checkbox label to save the username and the password for a VPN network. [CHAR LIMIT=40] -->
<string name="vpn_save_login">Save account information</string>
<!-- Hint for an optional input of a VPN network. [CHAR LIMIT=40] -->
<!-- Hint for not filling an optional field in a VPN configuration. [CHAR LIMIT=40] -->
<string name="vpn_not_used">(not used)</string>
<!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
<string name="vpn_no_ca_cert">(do not verify server)</string>

5
res/values/styles.xml
View File

@@ -143,12 +143,15 @@
<style name="vpn_label">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item>
<item name="android:textSize">16sp</item>
</style>
<style name="vpn_value">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
<item name="android:singleLine">true</item>
<item name="android:paddingBottom">1mm</item>
</style>
<style name="InputMethodPreferenceStyle">