diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-07-10 15:13:31 +0200 |
| commit | 8379f695166ee9888e6e1221894c7d1494669a6d (patch) | |
| tree | b43c4b4fe72916df1dd547ab706ffae34cdcd243 /res/menu | |
| parent | c7088489bd339e4b8b5128e909a1b4377864a5c9 (diff) | |
| parent | e97b5244552c8da06b3311bccb831be30c9a641a (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/contact_context.xml | 14 | ||||
| -rw-r--r-- | res/menu/start_conversation.xml | 33 |
2 files changed, 47 insertions, 0 deletions
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/start_conversation.xml b/res/menu/start_conversation.xml new file mode 100644 index 00000000..12109d7b --- /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:actionViewClass="android.widget.SearchView" + 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_create_conference" + android:icon="@drawable/ic_action_add_group" + android:showAsAction="always" + android:title="@string/create_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 |