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_routing.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_routing.xml')
| -rw-r--r-- | res/xml/vpn_routing.xml | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/res/xml/vpn_routing.xml b/res/xml/vpn_routing.xml deleted file mode 100644 index ce19a500..00000000 --- a/res/xml/vpn_routing.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > - - <CheckBoxPreference - android:key="routenopull" - android:summary="@string/ignore_routes_summary" - android:title="@string/ignored_pushed_routes" /> - - <PreferenceCategory android:title="@string/ipv4" > - <CheckBoxPreference - android:disableDependentsState="true" - android:key="useDefaultRoute" - android:summary="@string/default_route_summary" - android:title="@string/use_default_title" /> - - <EditTextPreference - android:dependency="useDefaultRoute" - android:dialogMessage="@string/custom_route_message" - android:key="customRoutes" - android:title="@string/custom_routes_title" /> - </PreferenceCategory> - <PreferenceCategory android:title="@string/ipv6" > - <CheckBoxPreference - android:disableDependentsState="true" - android:key="useDefaultRoutev6" - android:summary="@string/default_route_summary" - android:title="@string/use_default_title" /> - - <EditTextPreference - android:dependency="useDefaultRoutev6" - android:dialogMessage="@string/custom_route_message" - android:key="customRoutesv6" - android:title="@string/custom_routes_title" /> - </PreferenceCategory> - -</PreferenceScreen>
\ No newline at end of file |