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

14 files changed, 1 insertions, 703 deletions

diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
deleted file mode 100644
index 542de365..00000000
--- a/res/layout/basic_settings.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:leap="http://schemas.android.com/apk/res/se.leap.bitmaskclient"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="3mm" >
-
-        <TextView
-            style="@style/item"
-            android:text="@string/profilename"
-            android:textAppearance="?android:attr/textAppearanceSmall" 
-            />
-
-        <EditText
-            android:id="@+id/profilename"
-            style="@style/item"
-            android:inputType="text" />
-
-        <TextView
-            style="@style/item"
-            android:text="@string/address"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <EditText
-            android:id="@+id/address"
-            style="@style/item"
-            android:inputType="textUri"
-            android:text="@string/defaultserver" >
-
-            <!-- <requestFocus /> -->
-        </EditText>
-
-        <TextView
-            style="@style/item"
-            android:text="@string/port"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <RelativeLayout
-            android:id="@+id/relativeLayout1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dip"
-            android:layout_marginRight="8dip" >
-
-            <EditText
-                android:id="@+id/port"
-                style="@style/item"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:inputType="number"
-                android:text="@string/defaultport" />
-
-            <ToggleButton
-                android:id="@+id/tcpudp"
-                style="@style/accountSetupButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:textOff="TCP"
-                android:textOn="UDP" />
-        </RelativeLayout>
-
-        <CheckBox
-            android:id="@+id/lzo"
-            style="@style/item"
-            android:text="@string/useLZO" />
-
-        <TextView
-            style="@style/item"
-            android:text="@string/vpn_type"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <Spinner
-            android:id="@+id/type"
-            style="@style/item"
-            android:entries="@array/vpn_types"
-            android:prompt="@string/vpn_type" />
-
-        <LinearLayout
-            android:id="@+id/keystore"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <include layout="@layout/keystore_selector" />
-
-            <TextView
-                style="@style/item"
-                android:singleLine="false"
-                android:text="@string/extracahint"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/cacert"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <se.leap.openvpn.FileSelectLayout
-                android:id="@+id/caselect"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                leap:title="@string/ca_title" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/certs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <se.leap.openvpn.FileSelectLayout
-                android:id="@+id/certselect"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                leap:title="@string/client_certificate_title" />
-
-            <se.leap.openvpn.FileSelectLayout
-                android:id="@+id/keyselect"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                leap:title="@string/client_key_title" />
-
-            <LinearLayout
-                android:id="@+id/key_password_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone" >
-
-                <TextView
-                    style="@style/item"
-                    android:layout_marginLeft="8dip"
-                    android:layout_marginRight="8dip"
-                    android:text="@string/private_key_password"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <EditText
-                    android:id="@+id/key_password"
-                    style="@style/item"
-                    android:layout_marginLeft="8dip"
-                    android:layout_marginRight="8dip"
-                    android:hint="@string/pw_query_hint"
-                    android:inputType="textPassword" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/pkcs12"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <se.leap.openvpn.FileSelectLayout
-                android:id="@+id/pkcs12select"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                leap:title="@string/client_pkcs12_title" />
-
-            <TextView
-                style="@style/item"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:text="@string/pkcs12pwquery"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/pkcs12password"
-                style="@style/item"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:hint="@string/pw_query_hint"
-                android:inputType="textPassword" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/userpassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <TextView
-                style="@style/item"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:text="@string/auth_username"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/auth_username"
-                style="@style/item"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:inputType="textNoSuggestions" />
-
-            <TextView
-                style="@style/item"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:text="@string/auth_pwquery"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <EditText
-                android:id="@+id/auth_password"
-                style="@style/item"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
-                android:hint="@string/pw_query_hint"
-                android:inputType="textPassword" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/statickeys"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone" >
-
-            <TextView
-                style="@style/item"
-                android:singleLine="false"
-                android:text="@string/static_keys_info" />
-        </LinearLayout>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
index 9bda6d2e..a5387efd 100644
--- a/res/layout/client_dashboard.xml
+++ b/res/layout/client_dashboard.xml
@@ -7,13 +7,11 @@
     tools:context=".Dashboard" >
     
     <LinearLayout
-        android:id="@+id/providerLine"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:background="?android:attr/selectableItemBackground" >
     
         <LinearLayout
-            android:id="@+id/providerLabelWrapper"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
@@ -21,7 +19,6 @@
             android:paddingLeft="10dp" >
 
             <TextView
-                android:id="@+id/providerLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:ellipsize="marquee"
@@ -34,7 +31,6 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/providerNameWrapper"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
diff --git a/res/layout/config_converter.xml b/res/layout/config_converter.xml
deleted file mode 100644
index ea60c076..00000000
--- a/res/layout/config_converter.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <CheckBox
-        android:id="@+id/importpkcs12"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/importpkcs12fromconfig"
-        android:visibility="gone" />
-
-    <CheckBox
-        android:id="@+id/correcttls"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:text="@string/correcttls"
-        android:visibility="gone" />
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
index 8f5a93d0..5992a873 100644
--- a/res/layout/eip_service_fragment.xml
+++ b/res/layout/eip_service_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/eipServiceFragment"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp" >
@@ -69,4 +68,4 @@
 
     </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
deleted file mode 100644
index 959e82a5..00000000
--- a/res/layout/faq.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/faq_howto_title" />
-
-        <TextView
-            android:id="@+id/faq_howto"
-            style="@style/faqitem" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/faq_system_dialogs_title" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_system_dialogs" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/faq_duplicate_notification_title" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_duplicate_notification" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/battery_consumption_title" />
-
-        <TextView
-            android:id="@+id/baterry_consumption"
-            style="@style/faqitem" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/tap_mode" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_tap_mode" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/vpn_tethering_title" />
-
-        <TextView
-            style="@style/faqitem"
-            android:id="@+id/faq_tethering" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/faq_security_title" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_security" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/broken_images" />
-
-        <TextView
-            android:id="@+id/broken_images_faq"
-            style="@style/faqitem" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/faq_shortcut" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_howto_shortcut" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/tap_mode" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/tap_faq2" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/copying_log_entries" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_copying" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/tap_mode" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/tap_faq3" />
-
-        <TextView
-            style="@style/faqhead"
-            android:text="@string/faq_routing_title" />
-
-        <TextView
-            style="@style/faqitem"
-            android:text="@string/faq_routing" >
-        </TextView>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/file_dialog.xml b/res/layout/file_dialog.xml
deleted file mode 100644
index 8e07ce31..00000000
--- a/res/layout/file_dialog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/fragment_place"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/file_dialog_inline.xml b/res/layout/file_dialog_inline.xml
deleted file mode 100644
index 61e39134..00000000
--- a/res/layout/file_dialog_inline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-<!--  The header already states Inline File
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Inline File Data"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
- -->
-    <EditText
-        android:id="@+id/inlineFileData"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textMultiLine|textNoSuggestions"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-        
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml
deleted file mode 100644
index db791663..00000000
--- a/res/layout/file_dialog_main.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relativeLayout01"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/fdLinearLayoutList"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/importfile"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/import_file" >
-        </Button>
-
-        <Button
-            android:id="@+id/fdButtonSelect"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/select_file" >
-        </Button>
-	
-        <Button
-            android:id="@+id/fdClear"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/clear" >
-        </Button>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_above="@+id/fdLinearLayoutList"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/path"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-
-        <ListView
-            android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-
-        <TextView
-            android:id="@android:id/empty"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:text="@string/no_data" />
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/file_dialog_row.xml b/res/layout/file_dialog_row.xml
deleted file mode 100644
index c7a5f652..00000000
--- a/res/layout/file_dialog_row.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <ImageView
-        android:id="@+id/fdrowimage"
-        android:layout_width="wrap_content"
-        android:layout_height="35dp"
-        android:layout_alignParentLeft="true"
-        android:paddingLeft="3dp"
-        android:paddingRight="5dp" android:contentDescription="@string/file_icon"/>
-
-    <TextView
-        android:id="@+id/fdrowtext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/fdrowimage"
-        android:layout_alignTop="@+id/fdrowimage"
-        android:layout_toRightOf="@+id/fdrowimage"
-        android:gravity="center_vertical"
-        android:text="@+id/fdrowtext"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/file_select.xml b/res/layout/file_select.xml
deleted file mode 100644
index 7cc84c40..00000000
--- a/res/layout/file_select.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- A layout to select a certificate, akin to a file selector on web pages. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dip"
-    android:gravity="center_vertical" >
-
-    <Button
-        android:id="@+id/file_select_button"
-        style="@style/accountSetupButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:text="@string/file_select" />
-
-    <TextView
-        android:id="@+id/file_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/file_select_button"
-        android:text="@string/client_certificate_title"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/file_selected_item"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/file_title"
-        android:layout_marginLeft="16dip"
-        android:layout_toLeftOf="@+id/file_select_button"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/file_nothing_selected" />
-</RelativeLayout>
-
diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml
deleted file mode 100644
index 39b5d11b..00000000
--- a/res/layout/keystore_selector.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- A layout to select a certificate, akin to a file selector on web pages. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dip"
-    android:gravity="center_vertical" >
-
-    <Button
-        android:id="@+id/select_keystore_button"
-        style="@style/accountSetupButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:text="@string/select" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/select_keystore_button"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/aliasname"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/title"
-        android:layout_marginLeft="16dip"
-        android:layout_toLeftOf="@+id/select_keystore_button"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/no_certificate" />
-    <!-- android:textColor="@color/text_secondary_color" -->
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/viewconfig.xml b/res/layout/viewconfig.xml
deleted file mode 100644
index 5ae34ef0..00000000
--- a/res/layout/viewconfig.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextView
-        android:id="@+id/configview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml
deleted file mode 100644
index 40cfff4a..00000000
--- a/res/layout/vpn_list_item.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
-
-    <LinearLayout
-        android:id="@+id/vpn_list_item_left"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackground"
-        android:gravity="center_vertical" >
-
-        <LinearLayout
-            android:id="@android:id/widget_frame"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical" />
-
-               <TextView
-                android:id="@+android:id/vpn_item_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="2dip"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="5dip"
-        android:focusable="false"
-        android:layout_marginTop="5dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
-
-    <ImageView
-        android:id="@+id/quickedit_settings"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/configure_the_vpn"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
-        android:src="@drawable/ic_sysbar_quicksettings" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/vpn_profile_list.xml b/res/layout/vpn_profile_list.xml
deleted file mode 100644
index f4a24ece..00000000
--- a/res/layout/vpn_profile_list.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-    <LinearLayout
-        android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/no_vpn_profiles_defined"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-
-        <TextView
-            android:id="@+id/add_new_vpn_hint"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:id="@+id/import_vpn_hint"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-
-<Space
-            android:layout_width="match_parent"
-            android:layout_height="10sp" />
-        
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/faq_hint" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file