diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-04-20 21:32:03 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-04-20 21:32:03 +0200 |
commit | 70938a31a0e78203449d769fa5bda15ce73d1ed4 (patch) | |
tree | d789c0c44b26bdeeedde286ab3e09a67c3dd0e5b /src/main/res/menu/muc_details.xml | |
parent | 58572ba858835437011d2f450bd90fb93455b5c9 (diff) | |
parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) |
Merge branch 'master' into message_display_rework
Diffstat (limited to 'src/main/res/menu/muc_details.xml')
-rw-r--r-- | src/main/res/menu/muc_details.xml | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 51de4e75..ad79f577 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/action_edit_subject" @@ -8,26 +8,33 @@ android:showAsAction="always" android:title="@string/action_edit_subject"/> <item + android:id="@+id/action_share" + android:icon="?attr/icon_share" + android:showAsAction="always" + android:orderInCategory="15" + android:title="@string/share_uri_with"/> + + <item android:id="@+id/action_show_qr_code" - android:title="@string/show_qr_code" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/show_qr_code"/> <item android:id="@+id/action_save_as_bookmark" - android:title="@string/save_as_bookmark" android:orderInCategory="80" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/save_as_bookmark"/> <item android:id="@+id/action_delete_bookmark" - android:title="@string/delete_bookmark" android:orderInCategory="80" - android:showAsAction="never" /> - <item - android:id="@+id/action_advanced_mode" - android:title="@string/advanced_mode" - android:checkable="true" - android:checked="false" - android:orderInCategory="85" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/delete_bookmark"/> + <item + android:id="@+id/action_advanced_mode" + android:checkable="true" + android:checked="false" + android:orderInCategory="85" + android:showAsAction="never" + android:title="@string/advanced_mode"/> <item android:id="@+id/action_accounts" android:orderInCategory="90" |