diff options
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/contact_details.xml | 11 | ||||
| -rw-r--r-- | src/main/res/menu/conversations.xml | 11 | ||||
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 6 | ||||
| -rw-r--r-- | src/main/res/menu/menu_updater.xml | 7 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details.xml | 10 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details_context.xml | 2 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation.xml | 10 |
7 files changed, 21 insertions, 36 deletions
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index bd81b6d49..43ccc7927 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -30,15 +30,4 @@ android:showAsAction="never" android:title="@string/action_unblock_contact"/> - <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 diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 4c724d27d..8754f869c 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -18,8 +18,9 @@ android:orderInCategory="30" android:showAsAction="always" android:title="@string/attach_file"/> - <item +<!-- <item android:id="@+id/action_contact_details" + android:icon="?attr/icon_group" android:orderInCategory="40" android:showAsAction="never" android:title="@string/action_contact_details"/> @@ -27,8 +28,9 @@ android:id="@+id/action_muc_details" android:icon="?attr/icon_group" android:orderInCategory="40" - android:showAsAction="ifRoom" + android:showAsAction="never" android:title="@string/action_muc_details"/> +--> <item android:id="@+id/action_invite" android:orderInCategory="45" @@ -66,5 +68,10 @@ android:orderInCategory="100" android:showAsAction="never" android:title="@string/action_settings"/> + <item + android:id="@+id/action_check_updates" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_check_update"/> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 9f06fc4c4..30831920b 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -7,7 +7,8 @@ <item android:id="@+id/action_show_block_list" - android:showAsAction="never" + android:showAsAction="always" + android:icon="@drawable/ic_action_cancel" android:title="@string/show_block_list"/> <item @@ -29,7 +30,8 @@ <item android:id="@+id/action_change_password_on_server" - android:showAsAction="never" + android:showAsAction="always" + android:icon="@drawable/ic_action_edit" android:title="@string/change_password"/> <item diff --git a/src/main/res/menu/menu_updater.xml b/src/main/res/menu/menu_updater.xml new file mode 100644 index 000000000..f52657372 --- /dev/null +++ b/src/main/res/menu/menu_updater.xml @@ -0,0 +1,7 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context="eu.siacs.conversations.ui.UpdaterActivity"> + <item android:id="@+id/action_settings" android:title="@string/action_settings" + android:orderInCategory="100" app:showAsAction="never" /> +</menu> diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 51de4e753..1ae217709 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -28,15 +28,5 @@ android:checked="false" android:orderInCategory="85" android:showAsAction="never" /> - <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 diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index af5e691b7..4a8b13d16 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item + <item android:id="@+id/start_conversation" android:title="@string/start_conversation" android:visible="false"/> diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index a89d71ffd..b0472af05 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -29,15 +29,5 @@ android:orderInCategory="85" android:showAsAction="never" android:title="@string/hide_offline"/> - <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 |