diff options
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/choose_contact.xml | 10 | ||||
| -rw-r--r-- | res/menu/conversations.xml | 45 | ||||
| -rw-r--r-- | res/menu/muc_details.xml | 6 |
3 files changed, 36 insertions, 25 deletions
diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml new file mode 100644 index 00000000..3f402664 --- /dev/null +++ b/res/menu/choose_contact.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/action_search" + android:actionLayout="@layout/actionview_search" + android:icon="@drawable/ic_action_search" + android:showAsAction="collapseActionView|always" + android:title="@string/search"/> +</menu>
\ No newline at end of file diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 710a552e..215bbb66 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -2,62 +2,57 @@ <item android:id="@+id/action_add" - android:orderInCategory="10" android:icon="@drawable/ic_action_new" + android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_add" /> - + android:title="@string/action_add"/> <item android:id="@+id/action_security" + android:icon="@drawable/ic_action_not_secure" android:orderInCategory="20" android:showAsAction="always" - android:icon="@drawable/ic_action_not_secure" - android:title="@string/action_secure" /> - + android:title="@string/action_secure"/> <item android:id="@+id/action_attach_file" + android:icon="@drawable/ic_action_new_attachment" android:orderInCategory="30" android:showAsAction="always" - android:icon="@drawable/ic_action_new_attachment" - android:title="@string/attach_file" /> - + android:title="@string/attach_file"/> <item android:id="@+id/action_contact_details" android:orderInCategory="40" android:showAsAction="never" - android:title="@string/action_contact_details" /> - <item + 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:id="@+id/action_clear_history" android:orderInCategory="50" android:showAsAction="never" - android:title="@string/action_end_conversation"/> - <item - android:id="@+id/action_clear_history" + android:title="@string/action_clear_history"/> + <item + android:id="@+id/action_archive" android:orderInCategory="60" android:showAsAction="never" - android:title="@string/action_clear_history"/> + android:title="@string/action_end_conversation"/> <item 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 diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml index 4f9b6da0..685109cd 100644 --- a/res/menu/muc_details.xml +++ b/res/menu/muc_details.xml @@ -1,6 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item + android:id="@+id/action_edit_subject" + android:orderInCategory="10" + android:showAsAction="always" + android:icon="@drawable/ic_action_edit" + android:title="@string/action_edit_subject" /> + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" |