Merge branch 'development'

3 files changed, 12 insertions, 110 deletions

diff --git a/art/ic_action_copy.svg b/art/ic_action_copy.svg
deleted file mode 100644
index 485fd2ed..00000000
--- a/art/ic_action_copy.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg4066"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="ic_action_copy.svg">
-  <defs
-     id="defs4068" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.54117647"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.67"
-     inkscape:cx="51.750573"
-     inkscape:cy="57.547291"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="false"
-     inkscape:window-width="1035"
-     inkscape:window-height="853"
-     inkscape:window-x="369"
-     inkscape:window-y="3"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4071">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-924.36218)">
-    <rect
-       ry="0"
-       height="91.708199"
-       width="71.625328"
-       stroke-miterlimit="4"
-       y="952.36743"
-       x="42.730034"
-       id="rect10"
-       style="fill:none;stroke:#000000;stroke-width:8.6679945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.54117647;stroke-dasharray:none"
-       inkscape:transform-center-x="-21.391573"
-       inkscape:transform-center-y="28.294015" />
-    <path
-       style="fill:#000000;fill-opacity:0.5411765;fill-rule:evenodd;stroke:#000000;stroke-width:0.41999999999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117649999999995;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 20.552281,933.36985 0,0.0209 -0.128276,0 -0.399078,99.83215 0.213792,0 0,0.1463 13.212333,-0.021 0.05701,-8.1392 -4.076297,0.011 0.327814,-84.87039 58.436429,0 0.0285,3.427 11.10293,0 -0.0855,-9.25707 -0.057,0 0,-1.1493 -78.63263,0 z"
-       id="rect12-6"
-       inkscape:connector-curvature="0" />
-    <rect
-       height="4.7259107"
-       width="37.242958"
-       y="967.49921"
-       x="50.137043"
-       id="rect12"
-       style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.23799089px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647" />
-    <rect
-       style="fill:#000000;fill-opacity:0.54117647000000002;fill-rule:evenodd;stroke:#000000;stroke-width:0.274;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647000000002;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect4272"
-       x="50.137043"
-       y="982.49921"
-       width="49.452484"
-       height="4.7259107" />
-    <rect
-       height="4.7259107"
-       width="43.542446"
-       y="997.49921"
-       x="50.137043"
-       id="rect4274"
-       style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.2573325px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647" />
-    <rect
-       style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.25050664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647"
-       id="rect4276"
-       x="50.137043"
-       y="1012.4992"
-       width="41.263123"
-       height="4.7259107" />
-    <rect
-       height="4.7259107"
-       width="49.397911"
-       y="1027.4993"
-       x="50.137043"
-       id="rect4278"
-       style="fill:#000000;fill-opacity:0.54117647;fill-rule:evenodd;stroke:#000000;stroke-width:0.27408957px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.54117647" />
-  </g>
-</svg>
diff --git a/art/logo.png b/art/logo.png
new file mode 100644
index 00000000..a8ab6176
--- /dev/null
+++ b/art/logo.png
diff --git a/art/render.rb b/art/render.rb
index a78a2f47..2847891d 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -1,6 +1,16 @@
 #!/bin/env ruby
-resolutions={'mdpi'=> 1, 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3}
-images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12], 'ic_action_copy.svg' => ['ic_action_copy', 32] }
+resolutions={
+	'mdpi'=> 1,
+	'hdpi' => 1.5,
+	'xhdpi' => 2,
+	'xxhdpi' => 3,
+	}
+images = {
+	'conversations.svg' => ['ic_launcher', 48],
+	'conversations_baloon.svg' => ['ic_activity', 32],
+	'conversations_mono.svg' => ['ic_notification', 24],
+	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
+	}
 images.each do |source, result|
 	resolutions.each do |name, factor|
 		size = factor * result[1]