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

1 files changed, 0 insertions, 56 deletions

diff --git a/res/xml/vpn_obscure.xml b/res/xml/vpn_obscure.xml
deleted file mode 100644
index ecdd4e29..00000000
--- a/res/xml/vpn_obscure.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="Obscure Settings" >
-
-    <ListPreference
-        android:entries="@array/verb_entries"
-        android:entryValues="@array/verb_values"
-        android:key="verblevel"
-        android:persistent="false"
-        android:title="@string/log_verbosity_level" />
-
-    <CheckBoxPreference
-        android:key="useRandomHostname"
-        android:persistent="false"
-        android:summary="@string/random_host_summary"
-        android:title="@string/random_host_prefix" />
-    <CheckBoxPreference
-        android:key="useFloat"
-        android:persistent="false"
-        android:summary="@string/float_summary"
-        android:title="@string/float_title" />
-    <CheckBoxPreference
-        android:key="usePersistTun"
-        android:summary="@string/persisttun_summary"
-        android:title="@string/persistent_tun_title" />
-
-    <PreferenceCategory android:title="@string/reconnection_settings" >
-        <ListPreference
-            android:entries="@array/crm_entries"
-            android:entryValues="@array/crm_values"
-            android:key="connectretrymax"
-            android:persistent="false"
-            android:title="@string/connection_retries" />
-
-        <EditTextPreference
-            android:dialogMessage="@string/connectretrymessage"
-            android:key="connectretry"
-            android:persistent="false"
-            android:title="@string/connectretrywait" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/custom_config_title" >
-        <CheckBoxPreference
-            android:key="enableCustomOptions"
-            android:persistent="false"
-            android:summary="@string/custom_config_summary"
-            android:title="@string/custom_config_title" />
-
-        <EditTextPreference
-            android:dependency="enableCustomOptions"
-            android:dialogMessage="@string/custom_option_warning"
-            android:key="customOptions"
-            android:persistent="false"
-            android:title="@string/custom_options_title" />
-    </PreferenceCategory>
-
-</PreferenceScreen>
\ No newline at end of file