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_ipsettings.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_ipsettings.xml')
| -rw-r--r-- | res/xml/vpn_ipsettings.xml | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml deleted file mode 100644 index d559c89b..00000000 --- a/res/xml/vpn_ipsettings.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - - <SwitchPreference - android:disableDependentsState="true" - android:key="usePull" - android:summaryOff="@string/pull_off_summary" - android:summaryOn="@string/pull_on_summary" - android:title="@string/use_pull" /> - - <PreferenceCategory android:title="IP" > - <EditTextPreference - android:dependency="usePull" - android:dialogMessage="@string/ipv4_dialog_title" - android:key="ipv4_address" - android:title="@string/ipv4_address" /> - <EditTextPreference - android:dependency="usePull" - android:dialogMessage="@string/ipv6_dialog_tile" - android:key="ipv6_address" - android:title="@string/ipv6_address" /> - - <CheckBoxPreference - android:key="nobind" - android:persistent="false" - android:summary="@string/nobind_summary" - android:title="@string/no_bind" /> - </PreferenceCategory> - <PreferenceCategory android:title="@string/dns" > - <CheckBoxPreference - android:key="overrideDNS" - android:summary="@string/dns_override_summary" - android:title="@string/override_dns" /> - - <EditTextPreference - android:key="searchdomain" - android:title="@string/searchdomain" /> - <EditTextPreference - android:dialogMessage="@string/dns1_summary" - android:key="dns1" - android:title="@string/dns_server" /> - <EditTextPreference - android:dialogMessage="@string/secondary_dns_message" - android:key="dns2" - android:title="@string/backup_dns" /> - </PreferenceCategory> - -</PreferenceScreen>
\ No newline at end of file |