Merge branch 'feature/implement-gradle-build-system-#4676' into develop

3 files changed, 72 insertions, 0 deletions

diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
new file mode 100644
index 00000000..676c07c7
--- /dev/null
+++ b/app/src/main/res/menu/client_dashboard.xml
@@ -0,0 +1,23 @@
+<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/switch_provider"
+        android:orderInCategory="501"
+        android:title="@string/switch_provider_menu_option"/>  
+    <item
+        android:id="@+id/login_button"
+        android:showAsAction="ifRoom"
+        android:title="@string/login_button"
+        android:visible="false">
+    </item>
+    <item
+        android:id="@+id/logout_button"
+        android:showAsAction="ifRoom"
+        android:title="@string/logout_button"
+        android:visible="false">
+    </item>
+
+</menu>
diff --git a/app/src/main/res/menu/configuration_wizard_activity.xml b/app/src/main/res/menu/configuration_wizard_activity.xml
new file mode 100644
index 00000000..9936b6dc
--- /dev/null
+++ b/app/src/main/res/menu/configuration_wizard_activity.xml
@@ -0,0 +1,15 @@
+<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/new_provider_button"
+        android:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_menu_add"
+        />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml
new file mode 100644
index 00000000..c4087585
--- /dev/null
+++ b/app/src/main/res/menu/logmenu.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+    <item

+        android:id="@+id/clearlog"

+        android:icon="@drawable/ic_menu_trash_holo_light"

+        android:showAsAction="ifRoom|withText"

+        android:title="@string/clear_log"

+        android:titleCondensed="@string/clear"/>

+    <item

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

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

+        android:showAsAction="ifRoom|withText"

+        android:title="@string/cancel_connection"

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

+    <item

+        android:id="@+id/info"

+        android:icon="@android:drawable/ic_menu_info_details"

+        android:showAsAction="ifRoom|withText"

+        android:title="@string/show_connection_details"

+        android:titleCondensed="@string/info"/>

+

+    <item

+        android:id="@+id/send"

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

+        android:showAsAction="ifRoom|withText"

+        android:title="@string/send_logfile"

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

+    <item

+        android:alphabeticShortcut="e"

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

+        android:showAsAction="withText|ifRoom"

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

+

+</menu>