From 077932eb558853e4c3c3046c54db18c530495d8c Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Fri, 29 May 2015 11:18:25 +0200
Subject: CryptoNext Menu entries added

---
 src/main/res/menu/encryption_choices.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index adf0ad8d..1b3fe76e 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -11,6 +11,9 @@
         <item
             android:id="@+id/encryption_choice_pgp"
             android:title="@string/encryption_choice_pgp"/>
+        <item
+            android:id="@+id/encryption_choice_axolotl"
+            android:title="@string/encryption_choice_axolotl"/>
     </group>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 480b1cde810e0ed2afc6ea424fb36fd973ae24b9 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 23:35:03 +0200
Subject: Add clear devices to overflow menu in EditAccount

---
 src/main/res/menu/editaccount.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 4ce9e1f3..2076805e 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -20,4 +20,8 @@
 	<item android:id="@+id/action_change_password_on_server"
           android:title="@string/change_password"
           android:showAsAction="never" />
+
+    <item android:id="@+id/action_clear_devices"
+          android:title="@string/clear_other_devices"
+          android:showAsAction="never"/>
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3