Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 58 insertions, 0 deletions

diff --git a/src/displayapp/icons/navigation/roundabout_straight.svg b/src/displayapp/icons/navigation/roundabout_straight.svg
new file mode 100644
index 00000000..17477288
--- /dev/null
+++ b/src/displayapp/icons/navigation/roundabout_straight.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="roundabout_straight.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="22.862341"
+     inkscape:cx="-0.7325918"
+     inkscape:zoom="10.75"
+     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.25032"
+     id="path4"
+     d="M 9.9999967,7.7468218 A 4.7512324,4.7512324 0 1 1 5.2487646,12.498054 4.7565712,4.7565712 0 0 1 9.9999967,7.7468218 m 0,8.7522702 a 4.0010378,4.0010378 0 1 0 -4.0010376,-4.001038 4.0055764,4.0055764 0 0 0 4.0010376,4.001038 m 0,-9.002335 A 5.0012972,5.0012972 0 1 0 15.001294,12.498054 5.0070237,5.0070237 0 0 0 9.9999967,7.496757 Z m 0,8.75227 A 3.7509729,3.7509729 0 1 1 13.75097,12.498054 3.755074,3.755074 0 0 1 9.9999967,16.249027 Z M 13.539128,8.963812 A 4.9654754,4.9654754 0 0 0 10.625159,7.5352169 v -3.784244 a 0.22357049,0.22357049 0 0 1 0.339138,-0.2359612 l 1.845341,0.8400554 A 0.24167518,0.24167518 0 0 0 13.065592,3.9652535 L 9.9999967,0 6.9344018,3.965266 a 0.24168769,0.24168769 0 0 0 0.2559539,0.3898136 l 1.845479,-0.8400554 a 0.22354548,0.22354548 0 0 1 0.339,0.2359487 V 8.747081 h 0.625162 a 3.750973,3.750973 0 1 1 0,7.501946 H 9.3748347 V 20 h 1.2503243 v -2.539109 a 5.0022475,5.0022475 0 0 0 2.913969,-8.497079 z"
+     fill="#000000" />
+</svg>