From c206a91d320995f37f8abb33188bfd384249da3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 7 Apr 2014 20:43:34 +0200
Subject: Next step: compile jni sources correctly.

---
 app/src/main/res/menu/client_dashboard.xml         | 23 +++++++++++++++
 .../res/menu/configuration_wizard_activity.xml     | 15 ++++++++++
 app/src/main/res/menu/logmenu.xml                  | 34 ++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 app/src/main/res/menu/client_dashboard.xml
 create mode 100644 app/src/main/res/menu/configuration_wizard_activity.xml
 create mode 100644 app/src/main/res/menu/logmenu.xml

(limited to 'app/src/main/res/menu')

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>
-- 
cgit v1.2.3


From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 8 Apr 2014 12:04:17 +0200
Subject: Rename app->bitmask_android

This way, gradle commands generate apks correctly named.
---
 app/src/main/res/menu/client_dashboard.xml         | 23 ---------------
 .../res/menu/configuration_wizard_activity.xml     | 15 ----------
 app/src/main/res/menu/logmenu.xml                  | 34 ----------------------
 3 files changed, 72 deletions(-)
 delete mode 100644 app/src/main/res/menu/client_dashboard.xml
 delete mode 100644 app/src/main/res/menu/configuration_wizard_activity.xml
 delete mode 100644 app/src/main/res/menu/logmenu.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
deleted file mode 100644
index 676c07c7..00000000
--- a/app/src/main/res/menu/client_dashboard.xml
+++ /dev/null
@@ -1,23 +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/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
deleted file mode 100644
index 9936b6dc..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/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
deleted file mode 100644
index c4087585..00000000
--- a/app/src/main/res/menu/logmenu.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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>
-- 
cgit v1.2.3


From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 16:03:55 +0200
Subject: Back to the standard "app" module.

This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure
I'll have to tweak the final apk name in build.gradle.
---
 app/src/main/res/menu/client_dashboard.xml         | 23 +++++++++++++++
 .../res/menu/configuration_wizard_activity.xml     | 15 ++++++++++
 app/src/main/res/menu/logmenu.xml                  | 34 ++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 app/src/main/res/menu/client_dashboard.xml
 create mode 100644 app/src/main/res/menu/configuration_wizard_activity.xml
 create mode 100644 app/src/main/res/menu/logmenu.xml

(limited to 'app/src/main/res/menu')

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>
-- 
cgit v1.2.3