From 994c9495bad07fd7307ea85986a7766adb15cf84 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 15 Jan 2015 16:17:55 +0100
Subject: added dedicated button to disable foreground service in perma
 notification

---
 src/main/res/drawable-hdpi/ic_action_cancel.png   | Bin 0 -> 353 bytes
 src/main/res/drawable-mdpi/ic_action_cancel.png   | Bin 0 -> 272 bytes
 src/main/res/drawable-xhdpi/ic_action_cancel.png  | Bin 0 -> 415 bytes
 src/main/res/drawable-xxhdpi/ic_action_cancel.png | Bin 0 -> 574 bytes
 src/main/res/values/strings.xml                   |   3 ++-
 5 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_action_cancel.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_cancel.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_cancel.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_cancel.png

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 000000000..e206f296c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_cancel.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_cancel.png b/src/main/res/drawable-mdpi/ic_action_cancel.png
new file mode 100644
index 000000000..70e6d2d2a
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_cancel.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_cancel.png b/src/main/res/drawable-xhdpi/ic_action_cancel.png
new file mode 100644
index 000000000..d1634205d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_cancel.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png
new file mode 100644
index 000000000..5dc214356
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_cancel.png differ
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 54ab2c50a..883a41e77 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -357,7 +357,6 @@
     <string name="smp_requested">Contact requested SMP verification</string>
     <string name="no_otr_session_found">No valid OTR session has been found!</string>
     <string name="conversations_foreground_service">Conversations</string>
-    <string name="touch_to_disable">Touch to disable foreground service</string>
     <string name="pref_keep_foreground_service">Keep service in foreground</string>
     <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string>
     <string name="choose_file">Choose file</string>
@@ -441,4 +440,6 @@
 	<string name="video">video file</string>
 	<string name="pdf_document">PDF document</string>
 	<string name="received_x_file">Received %s</string>
+    <string name="disable_foreground_service">Disable foreground service</string>
+    <string name="touch_to_open_conversations">Touch to open Conversations</string>
 </resources>
-- 
cgit v1.2.3