aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-18 13:51:04 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-18 13:51:04 +0100
commitab832bcff72c024c0936080ec6e55fdafd20a7da (patch)
tree563f2f704c0b9e41b84b890cfb3bf81190b971f5 /src/main/res
parentd29c861d034b65b2004f21a3d1c350a12fc6fbc5 (diff)
properly remove conversations context menu
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/menu/conversations.xml7
-rw-r--r--src/main/res/menu/conversations_context.xml11
2 files changed, 7 insertions, 11 deletions
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 3edee120..d68c1436 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -49,6 +49,13 @@
android:orderInCategory="70"
android:showAsAction="never"
android:title="@string/disable_notifications"/>
+
+ <item
+ android:id="@+id/action_unmute"
+ android:orderInCategory="71"
+ android:showAsAction="never"
+ android:title="@string/enable_notifications"/>
+
<item
android:id="@+id/action_accounts"
android:orderInCategory="90"
diff --git a/src/main/res/menu/conversations_context.xml b/src/main/res/menu/conversations_context.xml
deleted file mode 100644
index 28dc2a6d..00000000
--- a/src/main/res/menu/conversations_context.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <item
- android:id="@+id/action_archive"
- android:title="@string/action_end_conversation"/>
- <item
- android:id="@+id/action_mute"
- android:title="@string/disable_notifications"/>
- <item
- android:id="@+id/action_unmute"
- android:title="@string/enable_notifications"/>
-</menu> \ No newline at end of file