Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 58 insertions, 0 deletions

diff --git a/src/displayapp/icons/navigation/uturn.svg b/src/displayapp/icons/navigation/uturn.svg
new file mode 100644
index 00000000..932751a0
--- /dev/null
+++ b/src/displayapp/icons/navigation/uturn.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="uturn.svg"
+   version="1.1"
+   viewBox="0 0 20 20"
+   height="20"
+   width="20"
+   data-name="WORKING ICONS"
+   id="WORKING_ICONS">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     inkscape:current-layer="WORKING_ICONS"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:cy="23.699023"
+     inkscape:cx="11.099225"
+     inkscape:zoom="15.202796"
+     showgrid="false"
+     id="namedview7"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <title
+     id="title2">direction</title>
+  <path
+     style="stroke-width:1.29032"
+     id="path4"
+     d="M 19.683663,7.0967742 V 19.350348 A 0.64962581,0.64962581 0 0 1 19.034012,20 H 17.752721 A 0.64962581,0.64962581 0 0 1 17.103018,19.350348 V 7.0967742 a 4.5161292,4.5161292 0 0 0 -9.0322585,0 v 5.1612908 h -0.011729 a 0.46138065,0.46138065 0 0 0 0.6998971,0.486941 l 3.8088254,-1.733871 a 0.49883871,0.49883871 0 0 1 0.528284,0.804568 L 6.7687079,20 0.44128854,11.815703 a 0.49883871,0.49883871 0 0 1 0.5282839,-0.804568 l 3.80882576,1.733871 a 0.46141935,0.46141935 0 0 0 0.6999871,-0.486941 h 0.011729 V 7.0967742 a 7.0967744,7.0967744 0 0 1 14.1935487,0 z"
+     fill="#000000" />
+</svg>