aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu/muc_details.xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
committersteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
commit20eae3955700341188bc1907a506970f5817a153 (patch)
tree6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/menu/muc_details.xml
parent980a84a6ce4358e8662addf203695e01d9f931dc (diff)
parentecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff)
Merge master-origin
Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/menu/muc_details.xml')
-rw-r--r--src/main/res/menu/muc_details.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 341d438a..51de4e75 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -3,7 +3,7 @@
<item
android:id="@+id/action_edit_subject"
- android:icon="@drawable/ic_action_edit"
+ android:icon="?attr/icon_edit"
android:orderInCategory="10"
android:showAsAction="always"
android:title="@string/action_edit_subject"/>
@@ -21,6 +21,13 @@
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" />
<item
android:id="@+id/action_accounts"
android:orderInCategory="90"