aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-22 17:23:31 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-22 17:23:31 +0200
commit9fcc195a6dad81c56a28f3924ab4912198fc3c38 (patch)
treeaea420a24d66887e51d763076e687eb123b0fbad /res
parent2345398652d03cdecf10f548cd71d982adf07995 (diff)
brought settings and manage account menu items back
Diffstat (limited to 'res')
-rw-r--r--res/menu/conversations.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index 2621289a..215bbb66 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -35,15 +35,15 @@
android:showAsAction="never"
android:title="@string/invite_contact"/>
<item
- android:id="@+id/action_archive"
+ android:id="@+id/action_clear_history"
android:orderInCategory="50"
android:showAsAction="never"
- android:title="@string/action_end_conversation"/>
+ android:title="@string/action_clear_history"/>
<item
- android:id="@+id/action_clear_history"
+ android:id="@+id/action_archive"
android:orderInCategory="60"
android:showAsAction="never"
- android:title="@string/action_clear_history"/>
+ android:title="@string/action_end_conversation"/>
<item
android:id="@+id/action_accounts"
android:orderInCategory="90"