diff options
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/conference_context.xml | 11 | ||||
| -rw-r--r-- | res/menu/contact_context.xml | 14 | ||||
| -rw-r--r-- | res/menu/conversations.xml | 7 | ||||
| -rw-r--r-- | res/menu/manageaccounts_context.xml | 2 | ||||
| -rw-r--r-- | res/menu/newconversation.xml | 15 | ||||
| -rw-r--r-- | res/menu/newconversation_context.xml | 22 | ||||
| -rw-r--r-- | res/menu/start_conversation.xml | 33 |
7 files changed, 62 insertions, 42 deletions
diff --git a/res/menu/conference_context.xml b/res/menu/conference_context.xml new file mode 100644 index 00000000..fd898580 --- /dev/null +++ b/res/menu/conference_context.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/context_join_conference" + android:title="@string/join_conference"/> + <item + android:id="@+id/context_delete_conference" + android:title="@string/delete_bookmark"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/contact_context.xml b/res/menu/contact_context.xml new file mode 100644 index 00000000..11ac7d7c --- /dev/null +++ b/res/menu/contact_context.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/context_start_conversation" + android:title="@string/start_conversation"/> + <item + android:id="@+id/context_contact_details" + android:title="@string/view_contact_details"/> + <item + android:id="@+id/context_delete_contact" + android:title="@string/delete_contact"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index ba627715..710a552e 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_add" android:orderInCategory="10" - android:icon="@drawable/ic_action_add" + android:icon="@drawable/ic_action_new" android:showAsAction="always" android:title="@string/action_add" /> @@ -11,7 +11,7 @@ android:id="@+id/action_security" android:orderInCategory="20" android:showAsAction="always" - android:icon="@drawable/ic_action_unsecure" + android:icon="@drawable/ic_action_not_secure" android:title="@string/action_secure" /> <item @@ -24,8 +24,7 @@ <item android:id="@+id/action_contact_details" android:orderInCategory="40" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_person" + android:showAsAction="never" android:title="@string/action_contact_details" /> <item android:id="@+id/action_muc_details" diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml index 5f76b0e0..04ecc25f 100644 --- a/res/menu/manageaccounts_context.xml +++ b/res/menu/manageaccounts_context.xml @@ -8,7 +8,7 @@ android:title="@string/mgmt_account_edit"/> <item android:id="@+id/mgmt_account_delete" - android:icon="@drawable/ic_action_delete" + android:icon="@drawable/ic_action_discard" android:showAsAction="always" android:title="@string/mgmt_account_delete"/> <item diff --git a/res/menu/newconversation.xml b/res/menu/newconversation.xml deleted file mode 100644 index 4f9b6da0..00000000 --- a/res/menu/newconversation.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - <item - android:id="@+id/action_accounts" - android:orderInCategory="90" - android:showAsAction="never" - android:title="@string/action_accounts" - /> - - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/action_settings"/> -</menu> diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml deleted file mode 100644 index 7492c265..00000000 --- a/res/menu/newconversation_context.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/action_contact_details" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_person" - android:title="@string/action_contact_details" /> - <item - android:id="@+id/action_start_conversation" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_chat" - android:title="@string/start_conversation" /> - <item - android:id="@+id/action_invite" - android:showAsAction="ifRoom" - android:title="@string/invite_contacts" /> - <item - android:id="@+id/action_invite_to_existing" - android:showAsAction="never" - android:title="@string/invite_contacts_to_existing" /> -</menu> diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml new file mode 100644 index 00000000..271bac18 --- /dev/null +++ b/res/menu/start_conversation.xml @@ -0,0 +1,33 @@ +<?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"/> + + <item + android:id="@+id/action_create_contact" + android:icon="@drawable/ic_action_add_person" + android:showAsAction="always" + android:title="@string/create_contact"/> + <item + android:id="@+id/action_join_conference" + android:icon="@drawable/ic_action_add_group" + android:showAsAction="always" + android:title="@string/join_conference"/> + + <item + android:id="@+id/action_accounts" + android:orderInCategory="90" + android:showAsAction="never" + android:title="@string/action_accounts"/> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings"/> + +</menu>
\ No newline at end of file |