aboutsummaryrefslogtreecommitdiffstats
path: root/res/menu/conversations.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/menu/conversations.xml')
-rw-r--r--res/menu/conversations.xml46
1 files changed, 20 insertions, 26 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index 68bcc957..2621289a 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -2,48 +2,44 @@
<item
android:id="@+id/action_add"
+ android:icon="@drawable/ic_action_new"
android:orderInCategory="10"
- android:icon="@drawable/ic_action_add"
- android:showAsAction="ifRoom"
- android:title="@string/action_add" />
-
+ android:showAsAction="always"
+ android:title="@string/action_add"/>
<item
android:id="@+id/action_security"
+ android:icon="@drawable/ic_action_not_secure"
android:orderInCategory="20"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_unsecure"
- android:title="@string/action_secure" />
-
+ android:showAsAction="always"
+ android:title="@string/action_secure"/>
<item
android:id="@+id/action_attach_file"
- android:orderInCategory="30"
- android:showAsAction="ifRoom"
android:icon="@drawable/ic_action_new_attachment"
- android:title="@string/attach_file" />
-
+ android:orderInCategory="30"
+ android:showAsAction="always"
+ android:title="@string/attach_file"/>
<item
android:id="@+id/action_contact_details"
android:orderInCategory="40"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_person"
- android:title="@string/action_contact_details" />
- <item
+ android:showAsAction="never"
+ android:title="@string/action_contact_details"/>
+ <item
android:id="@+id/action_muc_details"
+ android:icon="@drawable/ic_action_group"
android:orderInCategory="40"
android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_group"
- android:title="@string/action_muc_details" />
- <item
+ android:title="@string/action_muc_details"/>
+ <item
android:id="@+id/action_invite"
+ android:orderInCategory="45"
android:showAsAction="never"
- android:title="@string/invite_contacts" />
-
+ android:title="@string/invite_contact"/>
<item
android:id="@+id/action_archive"
android:orderInCategory="50"
android:showAsAction="never"
android:title="@string/action_end_conversation"/>
- <item
+ <item
android:id="@+id/action_clear_history"
android:orderInCategory="60"
android:showAsAction="never"
@@ -52,13 +48,11 @@
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
- android:title="@string/action_accounts"
- />
-
+ android:title="@string/action_accounts"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
-</menu>
+</menu> \ No newline at end of file