diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
| commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/res/menu/start_conversation.xml | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) | |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to 'src/main/res/menu/start_conversation.xml')
| -rw-r--r-- | src/main/res/menu/start_conversation.xml | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml new file mode 100644 index 00000000..f7230169 --- /dev/null +++ b/src/main/res/menu/start_conversation.xml @@ -0,0 +1,31 @@ +<?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 |