Merge branch '8851_remove_menu' into 0xacab_0.9.8

* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/49

3 files changed, 0 insertions, 21 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index 3bf51a8c..75fffaf7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -369,12 +369,6 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);
-        return true;
-    }
-
     public class ProviderAPIBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/app/src/main/res/menu/configuration_wizard_activity.xml b/app/src/main/res/menu/configuration_wizard_activity.xml
deleted file mode 100644
index 21591547..00000000
--- a/app/src/main/res/menu/configuration_wizard_activity.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/about_leap"
-        android:orderInCategory="110"
-        android:title="@string/about"/>
-
-    <item
-        android:id="@+id/new_provider"
-        android:orderInCategory="210"
-        android:title="@string/add_provider"
-        android:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_menu_add"
-        />
-</menu>
\ No newline at end of file
diff --git a/ics-openvpn b/ics-openvpn
-Subproject a727180b24969f7320c562925dabf27afd57c40
+Subproject 984e58fea146fff53d2348d869ca4e1076cb9c9