diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-12-22 15:00:51 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-12-22 15:00:51 +0100 |
| commit | a94663aaa4d52ba27ada76abe55d2d113304b4e0 (patch) | |
| tree | 38e73cc693fef7462ecabffd984348a86b768ae3 /src/main/res/menu | |
| parent | 96569700512e9618efa18eeb277665045678e16d (diff) | |
| parent | af7a64491fa5c514866d0f1952c034a7672bb508 (diff) | |
Merge pull request #796 from SamWhited/xep0191
XEP-0191 Support
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/contact_context.xml | 3 | ||||
| -rw-r--r-- | src/main/res/menu/conversations.xml | 12 | ||||
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 4 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml index 11ac7d7c..223c7ece 100644 --- a/src/main/res/menu/contact_context.xml +++ b/src/main/res/menu/contact_context.xml @@ -8,6 +8,9 @@ android:id="@+id/context_contact_details" android:title="@string/view_contact_details"/> <item + android:id="@+id/context_contact_block_unblock" + android:title="@string/block_contact"/> + <item android:id="@+id/context_delete_contact" android:title="@string/delete_contact"/> diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index d68c1436..6c22ed18 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -57,6 +57,18 @@ android:title="@string/enable_notifications"/> <item + android:id="@+id/action_block" + android:orderInCategory="72" + android:showAsAction="never" + android:title="@string/action_block_contact"/> + + <item + android:id="@+id/action_unblock" + android:orderInCategory="73" + android:showAsAction="never" + android:title="@string/action_unblock_contact"/> + + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 2301caf0..5d10901e 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -4,5 +4,9 @@ android:id="@+id/action_show_qr_code" android:title="@string/show_qr_code" android:showAsAction="never" /> + <item + android:id="@+id/action_show_block_list" + android:title="@string/show_block_list" + android:showAsAction="never" /> </menu>
\ No newline at end of file |