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

6 files changed, 1 insertions, 71 deletions

diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index 806147eb..bdd49ab9 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -1,7 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/menu_settings"
         android:orderInCategory="100"
         android:title="@string/menu_settings"/>
     <item
@@ -9,10 +8,6 @@
         android:orderInCategory="110"
         android:title="@string/about"/>
     <item
-        android:id="@+id/legacy_interface"
-        android:orderInCategory="500"
-        android:title="ICS OpenVPN Interface"/>
-    <item
         android:id="@+id/switch_provider"
         android:orderInCategory="501"
         android:title="@string/switch_provider_menu_option"/>  
diff --git a/res/menu/configmenu.xml b/res/menu/configmenu.xml
deleted file mode 100644
index 1d47e26b..00000000
--- a/res/menu/configmenu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<menu xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <item

-        android:id="@+id/sendConfig"

-        android:icon="@android:drawable/ic_menu_share"

-        android:showAsAction="ifRoom|withText"

-        android:title="Send config file"

-        android:titleCondensed="@string/send"/>

-

-</menu>
\ No newline at end of file
diff --git a/res/menu/import_menu.xml b/res/menu/import_menu.xml
deleted file mode 100644
index c29db10e..00000000
--- a/res/menu/import_menu.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<menu xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <item

-        android:id="@+id/ok"

-        android:icon="@android:drawable/ic_menu_save"

-        android:showAsAction="ifRoom|withText"

-        android:title="@string/add_profile"

-        android:titleCondensed="@string/import_vpn"/>

-    <item

-        android:id="@+id/cancel"

-        android:icon="@android:drawable/ic_menu_close_clear_cancel"

-        android:showAsAction="ifRoom|withText"

-        android:title="@android:string/cancel"

-        android:titleCondensed="@string/cancel"/>

-    

-

-</menu>
\ No newline at end of file
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index bb810df0..c4087585 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -26,10 +26,9 @@
         android:title="@string/send_logfile"

         android:titleCondensed="@string/send"/>

     <item

-        android:id="@+id/edit_vpn"

         android:alphabeticShortcut="e"

         android:icon="@android:drawable/ic_menu_edit"

         android:showAsAction="withText|ifRoom"

         android:title="@string/edit_vpn"/>

 

-</menu>
\ No newline at end of file
+</menu>

diff --git a/res/menu/vpn_context.xml b/res/menu/vpn_context.xml
deleted file mode 100644
index 239f1577..00000000
--- a/res/menu/vpn_context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/edit_vpn"
-        android:alphabeticShortcut="e"
-        android:icon="@android:drawable/ic_menu_edit"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/edit_vpn"/>
-    <item
-        android:id="@+id/remove_vpn"
-        android:alphabeticShortcut="d"
-        android:icon="@android:drawable/ic_menu_delete"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/remove_vpn"/>
-    
-    <!--  does not look good on phone portrait with 3 items :( -->
-    <!--  <item
-        android:id="@+id/connect_vpn"
-        android:alphabeticShortcut="c"
-        android:icon="@android:drawable/ic_media_play"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/connect"/>
-	-->
-</menu>
\ No newline at end of file
diff --git a/res/menu/vpnpreferences_menu.xml b/res/menu/vpnpreferences_menu.xml
deleted file mode 100644
index 71744d3c..00000000
--- a/res/menu/vpnpreferences_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:id="@+id/remove_vpn"
-        android:alphabeticShortcut="d"
-        android:icon="@android:drawable/ic_menu_delete"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/remove_vpn"/>
-    
-</menu>
\ No newline at end of file