diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2014-02-04 18:07:16 -0800 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2014-02-04 18:07:16 -0800 |
| commit | c49e87b8fd272fabc3f674fa8103b455c3bb5304 (patch) | |
| tree | d79c3f152c8a3fba149430b886b36905f4949cce /res/xml/vpn_authentification.xml | |
| parent | dbf1265f736c00aa31289e75818b1ec56311d31c (diff) | |
| parent | 53be6c97314d2a0c96be8b7c9a3c7e5ae493c901 (diff) | |
Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' into develop
Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop
Diffstat (limited to 'res/xml/vpn_authentification.xml')
| -rw-r--r-- | res/xml/vpn_authentification.xml | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml deleted file mode 100644 index 99e0f3e8..00000000 --- a/res/xml/vpn_authentification.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - - <CheckBoxPreference - android:key="remoteServerTLS" - android:summary="@string/check_remote_tlscert" - android:title="@string/check_remote_tlscert_title" /> - <CheckBoxPreference - android:key="checkRemoteCN" - android:summary="@string/remote_tlscn_check_summary" - android:title="@string/remote_tlscn_check_title" /> - - <EditTextPreference - android:dependency="checkRemoteCN" - android:dialogMessage="@string/enter_tlscn_dialog" - android:key="remotecn" - android:title="@string/enter_tlscn_title" /> - - <PreferenceCategory android:title="@string/tls_authentication" > - <SwitchPreference - android:key="useTLSAuth" - android:summary="@string/tls_key_auth" - android:title="@string/useTLSAuth" /> - - <Preference - android:dependency="useTLSAuth" - android:key="tlsAuthFile" - android:title="@string/tls_auth_file" /> - - <ListPreference - android:dependency="useTLSAuth" - android:entries="@array/tls_directions_entries" - android:entryValues="@array/tls_directions_values" - android:key="tls_direction" - android:persistent="false" - android:title="@string/tls_direction" /> - </PreferenceCategory> - <PreferenceCategory android:title="@string/encryption" > - <EditTextPreference - android:dialogMessage="@string/chipher_dialog_message" - android:dialogTitle="@string/cipher_dialog_title" - android:key="cipher" - android:persistent="false" - android:title="Encryption cipher" /> - </PreferenceCategory> - -</PreferenceScreen>
\ No newline at end of file |