From bdb335e6b08d35a23468ca1d5730330c520a6a90 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Mon, 5 Jan 2015 15:06:39 +0100
Subject: Show affiliation instead of role in MucDetails and offer 'advanced
 mode' to display role

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

(limited to 'src/main/res/menu/muc_details.xml')

diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 341d438a..7587e55c 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -21,6 +21,13 @@
         android:title="@string/delete_bookmark"
         android:orderInCategory="80"
         android:showAsAction="never" />
+	<item
+		android:id="@+id/action_advanced_mode"
+		android:title="@string/advanced_mode"
+		android:checkable="true"
+		android:checked="false"
+		android:orderInCategory="85"
+		android:showAsAction="never" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3


From 48604a66201e0c0f403ba1576e35833c7407a7d0 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 21 Jan 2015 23:00:35 -0500
Subject: Use Material Design Icons on API 21+

---
 src/main/res/menu/muc_details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/menu/muc_details.xml')

diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 7587e55c..51de4e75 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_edit_subject"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_subject"/>
-- 
cgit v1.2.3