From 8010fd2420f5e05dce90b543a23db9fb3262a17a Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Wed, 11 Apr 2018 18:43:39 -0300
Subject: [PATCH 1/2] New view selector behaviour. Update icons

---
 .../resources/icons/+android/backward.svg     |  10 +-
 .../resources/icons/+android/mic-unmute-a.svg |  92 +++--------
 .../resources/icons/+android/myview-a.svg     |  12 +-
 .../resources/icons/+android/radar-a.svg      |   1 -
 .../resources/icons/+android/radar-hover.svg  |   1 -
 .../resources/icons/+android/radar-i.svg      |   1 -
 interface/resources/images/fly.png            | Bin 11088 -> 8688 bytes
 .../resources/qml/hifi/+android/modesbar.qml  |  26 +--
 scripts/system/+android/modes.js              | 156 ++++--------------
 9 files changed, 74 insertions(+), 225 deletions(-)
 mode change 100644 => 100755 interface/resources/icons/+android/mic-unmute-a.svg
 delete mode 100755 interface/resources/icons/+android/radar-a.svg
 delete mode 100755 interface/resources/icons/+android/radar-hover.svg
 delete mode 100755 interface/resources/icons/+android/radar-i.svg

diff --git a/interface/resources/icons/+android/backward.svg b/interface/resources/icons/+android/backward.svg
index ad102b886e..6b4c560768 100755
--- a/interface/resources/icons/+android/backward.svg
+++ b/interface/resources/icons/+android/backward.svg
@@ -3,13 +3,11 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
 <style type="text/css">
-	.st0{opacity:0.7;}
-	.st1{fill:none;stroke:#FFFFFF;stroke-width:6.4193;stroke-linecap:round;stroke-miterlimit:10;}
+	.st0{opacity:0.85;fill:#FFFFFF;}
 </style>
 <g id="Layer_2_1_">
 </g>
-<g class="st0">
-	<polyline class="st1" points="24.3,43.4 5.8,25.2 5.8,25.1 24,6.6 	"/>
-	<line class="st1" x1="7.2" y1="25" x2="44.2" y2="25"/>
-</g>
+<path class="st0" d="M44.2,21.8H13.6L26.3,8.9c1.2-1.3,1.2-3.3,0-4.5s-3.3-1.2-4.5,0L3.5,22.8c-0.6,0.6-0.9,1.4-0.9,2.3v0.1
+	c0,0.9,0.3,1.7,1,2.3L22,45.7c0.6,0.6,1.4,0.9,2.3,0.9c0.8,0,1.7-0.3,2.3-1c1.2-1.3,1.2-3.3,0-4.5L13.4,28.2h30.8
+	c1.8,0,3.2-1.4,3.2-3.2S46,21.8,44.2,21.8z"/>
 </svg>
diff --git a/interface/resources/icons/+android/mic-unmute-a.svg b/interface/resources/icons/+android/mic-unmute-a.svg
old mode 100644
new mode 100755
index bb28dc0f2b..8717636a34
--- a/interface/resources/icons/+android/mic-unmute-a.svg
+++ b/interface/resources/icons/+android/mic-unmute-a.svg
@@ -1,70 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 50 50"
-   style="enable-background:new 0 0 50 50;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="mic-unmute-a.svg"><metadata
-     id="metadata22"><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><defs
-     id="defs20" /><sodipodi:namedview
-     pagecolor="#ff0000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="852"
-     inkscape:window-height="480"
-     id="namedview18"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="25"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4">
-	.st0{fill:#FFFFFF;}
-</style><g
-     id="Layer_2" /><g
-     id="Layer_1"
-     style="fill:#b2b2b2;fill-opacity:1"><path
-       class="st0"
-       d="M31.4,14.1l2.2-2.2c-2.1-2.5-5.3-4.1-8.8-4.1c-3.4,0-6.4,1.5-8.5,3.8c0.7,0.7,1.5,1.5,2.2,2.2   c1.6-1.7,3.8-2.9,6.3-2.9C27.5,10.9,29.9,12.1,31.4,14.1z"
-       id="path8"
-       style="fill:#b2b2b2;fill-opacity:1" /><path
-       class="st0"
-       d="M36.5,9l2.2-2.2C35.3,3,30.3,0.6,24.8,0.6c-5.3,0-10.2,2.3-13.6,5.9c0.7,0.7,1.5,1.5,2.2,2.2   c2.9-3,6.9-5,11.4-5C29.5,3.7,33.6,5.8,36.5,9z"
-       id="path10"
-       style="fill:#b2b2b2;fill-opacity:1" /><path
-       class="st0"
-       d="M28.5,22.7v-4.4c0-2-1.6-3.6-3.7-3.6h0c-2,0-3.7,1.6-3.7,3.6v4.4H28.5z"
-       id="path12"
-       style="fill:#b2b2b2;fill-opacity:1" /><path
-       class="st0"
-       d="M21.1,26.5v4.3c0,2,1.7,3.6,3.7,3.6h0c2,0,3.7-1.6,3.7-3.6v-4.3H21.1z"
-       id="path14"
-       style="fill:#b2b2b2;fill-opacity:1" /><path
-       class="st0"
-       d="M36,31.5c0-0.1,0-5.1,0-5.3c0-1-0.9-1.7-1.8-1.7c-1,0-1.7,0.8-1.7,1.8c0,0.3,0,4.8,0,5.2   c0,3.7-3.4,6.7-7.5,6.7c-4.1,0-7.5-3-7.5-6.7c0-0.4,0-4.9,0-5.3c0-1-0.7-1.8-1.6-1.8C14.9,24.3,14,25,14,26c0,0.3,0,5.4,0,5.5   c0,5.1,4,9.3,9.2,10.1l0,3.4h-4.3c-1,0-1.8,0.8-1.8,1.8c0,1,0.8,1.8,1.8,1.8h12.3c1,0,1.8-0.8,1.8-1.8c0-1-0.8-1.8-1.8-1.8h-4.4   l0-3.4C32,40.7,36,36.6,36,31.5z"
-       id="path16"
-       style="fill:#b2b2b2;fill-opacity:1" /></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.85;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g id="Layer_2_1_" class="st0">
+</g>
+<g class="st0">
+	<path class="st1" d="M31.5,14.5l2.2-2.2c-2.1-2.5-5.3-4.1-8.8-4.1c-3.4,0-6.4,1.5-8.5,3.8c0.7,0.7,1.5,1.5,2.2,2.2
+		c1.6-1.7,3.8-2.9,6.3-2.9C27.5,11.3,30,12.5,31.5,14.5z"/>
+	<path class="st1" d="M24.8,1c-5.3,0-10.2,2.3-13.6,5.9c0.7,0.7,1.5,1.5,2.2,2.2c2.9-3,6.9-5,11.4-5c4.7,0,8.8,2.1,11.7,5.3l2.2-2.2
+		C35.3,3.4,30.3,1,24.8,1z"/>
+	<path class="st1" d="M28.5,18.7c0-2-1.6-3.6-3.7-3.6c-2,0-3.7,1.6-3.7,3.6v4.4h7.4V18.7z"/>
+	<path class="st1" d="M21.1,31.2c0,2,1.7,3.6,3.7,3.6s3.7-1.6,3.7-3.6v-4.3h-7.4V31.2z"/>
+	<path class="st1" d="M34.3,24.9c-1,0-1.7,0.8-1.7,1.8c0,0.3,0,4.8,0,5.2c0,3.7-3.4,6.7-7.5,6.7s-7.5-3-7.5-6.7c0-0.4,0-4.9,0-5.3
+		c0-1-0.7-1.8-1.6-1.8c-1-0.1-1.9,0.6-1.9,1.6c0,0.3,0,5.4,0,5.5c0,5.1,4,9.3,9.2,10.1v3.4H19c-1,0-1.8,0.8-1.8,1.8S18,49,19,49
+		h12.3c1,0,1.8-0.8,1.8-1.8s-0.8-1.8-1.8-1.8h-4.4V42C32,41.1,36,37,36,31.9c0-0.1,0-5.1,0-5.3C36,25.6,35.1,24.9,34.3,24.9z"/>
+</g>
+</svg>
diff --git a/interface/resources/icons/+android/myview-a.svg b/interface/resources/icons/+android/myview-a.svg
index 9964678074..f8becb3850 100755
--- a/interface/resources/icons/+android/myview-a.svg
+++ b/interface/resources/icons/+android/myview-a.svg
@@ -3,17 +3,17 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
 <style type="text/css">
-	.st0{opacity:0.7;}
+	.st0{opacity:0.85;}
 	.st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
 </style>
 <g id="Layer_2_1_">
 </g>
 <g class="st0">
-	<path class="st1" d="M48.1,22.5c-1.6-1.9-3.2-4-5.2-5.6c-5.2-4.4-11.1-6.9-17.8-7.1c-6,0.1-11.1,2-15.8,5.2c-3,2-5.6,4.4-7.6,7.4
+	<path class="st1" d="M48.1,22.6c-1.6-1.9-3.2-4-5.2-5.6c-5.2-4.4-11.1-6.9-17.8-7.1c-6,0.1-11.1,2-15.8,5.2c-3,2-5.6,4.4-7.6,7.4
 		c-1.1,1.7-1.1,3.3,0,5c1.8,2.7,4.1,4.8,6.6,6.7c4.9,3.6,10.4,5.9,16.6,5.9c5.8,0,10.9-2,15.6-5.2c3-2,5.6-4.4,7.6-7.4
-		C49.4,25.8,49.5,24.1,48.1,22.5z M46.4,27.1C41,34,33.9,38,26.2,38.5c-7.3-0.1-12.6-2.4-17.4-6c-2.2-1.6-4.1-3.5-5.6-5.8
-		c-0.7-1-0.9-2-0.1-3.1c4.8-7.1,16.4-14.6,28.2-11.1c6.2,1.9,11.3,5.3,15.2,10.5C47.8,24.7,47.8,25.3,46.4,27.1z"/>
-	<path class="st1" d="M25,15.6c-5.3,0-9.4,4.1-9.5,9.4c0,5.3,4.2,9.5,9.5,9.5c5.3,0,9.4-4.2,9.4-9.5C34.4,19.7,30.3,15.6,25,15.6z
-		 M24.9,32.9c-4.2,0-7.8-3.6-7.8-7.9c0-4.2,3.6-7.8,7.8-7.8c4.2,0,7.9,3.6,7.8,7.8C32.8,29.3,29.2,32.9,24.9,32.9z"/>
+		C49.4,25.9,49.5,24.2,48.1,22.6z M46.4,27.2C41,34.1,33.9,38.1,26.2,38.6c-7.3-0.1-12.6-2.4-17.4-6c-2.2-1.6-4.1-3.5-5.6-5.8
+		c-0.7-1-0.9-2-0.1-3.1c4.8-7.1,16.4-14.6,28.2-11.1c6.2,1.9,11.3,5.3,15.2,10.5C47.8,24.8,47.8,25.4,46.4,27.2z"/>
+	<path class="st1" d="M25,15.7c-5.3,0-9.4,4.1-9.5,9.4c0,5.3,4.2,9.5,9.5,9.5s9.4-4.2,9.4-9.5S30.3,15.7,25,15.7z M24.9,33
+		c-4.2,0-7.8-3.6-7.8-7.9c0-4.2,3.6-7.8,7.8-7.8c4.2,0,7.9,3.6,7.8,7.8C32.8,29.4,29.2,33,24.9,33z"/>
 </g>
 </svg>
diff --git a/interface/resources/icons/+android/radar-a.svg b/interface/resources/icons/+android/radar-a.svg
deleted file mode 100755
index e4b157f827..0000000000
--- a/interface/resources/icons/+android/radar-a.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31.87 31.87"><defs><style type="text/css">.cls-1{fill:#ffffff;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M15.94,19.45a3.51,3.51,0,1,1,3.51-3.51A3.51,3.51,0,0,1,15.94,19.45Zm0-5.36a1.85,1.85,0,1,0,1.85,1.85A1.85,1.85,0,0,0,15.94,14.09Z"/><circle class="cls-1" cx="22.65" cy="20.94" r="1.85"/><path class="cls-1" d="M15.94,0A15.84,15.84,0,0,0,7.16,2.65,3.52,3.52,0,0,1,8.24,3.94,14.34,14.34,0,1,1,3.67,8.68a3.51,3.51,0,0,1-1.31-1A15.92,15.92,0,1,0,15.94,0Z"/><circle class="cls-1" cx="5.1" cy="5.48" r="1.85"/><path class="cls-1" d="M19.73,22.88A7.9,7.9,0,0,1,8.82,19.37a3.48,3.48,0,0,1-1.28.25,3.46,3.46,0,0,1-.46,0A9.55,9.55,0,0,0,21,24,3.52,3.52,0,0,1,19.73,22.88Z"/><path class="cls-1" d="M15.94,6.36a9.59,9.59,0,0,0-9,6.3,3.49,3.49,0,0,1,.59-.06,3.47,3.47,0,0,1,1.13.2,7.91,7.91,0,0,1,15,4.79,3.5,3.5,0,0,1,1.48.89A9.55,9.55,0,0,0,15.94,6.36Z"/><circle class="cls-1" cx="7.54" cy="16.11" r="1.85"/><!--<path class="cls-1" d="M5.2,38.52v2H4.09V35.37H5.71c1.39,0,2.09.5,2.09,1.55a1.42,1.42,0,0,1-1,1.4l1.34,2.23H6.87l-1.11-2Zm.58-.78c.58,0,.89-.24.89-.82s-.31-.77-1-.77H5.2v1.59Z"/><path class="cls-1" d="M9.9,39.39l-.29,1.16H8.46l1.6-5.19H11.4L13,40.55H11.82l-.29-1.16Zm.81-3.21-.6,2.39h1.21Z"/><path class="cls-1" d="M17.87,37.94a2.3,2.3,0,0,1-2.55,2.62H13.84V35.37H15.2C16.57,35.37,17.87,35.79,17.87,37.94Zm-2.93,1.81h.45c.76,0,1.33-.35,1.33-1.81s-.61-1.76-1.36-1.76h-.43Z"/><path class="cls-1" d="M19.69,39.39l-.29,1.16H18.25l1.6-5.19h1.34l1.59,5.19H21.61l-.29-1.16Zm.81-3.21-.6,2.39h1.21Z"/><path class="cls-1" d="M24.74,38.52v2h-1.1V35.37h1.62c1.39,0,2.09.5,2.09,1.55a1.42,1.42,0,0,1-1,1.4l1.34,2.23H26.41l-1.11-2Zm.58-.78c.58,0,.89-.24.89-.82s-.31-.77-1-.77h-.49v1.59Z"/>--></g></g></svg>
\ No newline at end of file
diff --git a/interface/resources/icons/+android/radar-hover.svg b/interface/resources/icons/+android/radar-hover.svg
deleted file mode 100755
index e4b157f827..0000000000
--- a/interface/resources/icons/+android/radar-hover.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31.87 31.87"><defs><style type="text/css">.cls-1{fill:#ffffff;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M15.94,19.45a3.51,3.51,0,1,1,3.51-3.51A3.51,3.51,0,0,1,15.94,19.45Zm0-5.36a1.85,1.85,0,1,0,1.85,1.85A1.85,1.85,0,0,0,15.94,14.09Z"/><circle class="cls-1" cx="22.65" cy="20.94" r="1.85"/><path class="cls-1" d="M15.94,0A15.84,15.84,0,0,0,7.16,2.65,3.52,3.52,0,0,1,8.24,3.94,14.34,14.34,0,1,1,3.67,8.68a3.51,3.51,0,0,1-1.31-1A15.92,15.92,0,1,0,15.94,0Z"/><circle class="cls-1" cx="5.1" cy="5.48" r="1.85"/><path class="cls-1" d="M19.73,22.88A7.9,7.9,0,0,1,8.82,19.37a3.48,3.48,0,0,1-1.28.25,3.46,3.46,0,0,1-.46,0A9.55,9.55,0,0,0,21,24,3.52,3.52,0,0,1,19.73,22.88Z"/><path class="cls-1" d="M15.94,6.36a9.59,9.59,0,0,0-9,6.3,3.49,3.49,0,0,1,.59-.06,3.47,3.47,0,0,1,1.13.2,7.91,7.91,0,0,1,15,4.79,3.5,3.5,0,0,1,1.48.89A9.55,9.55,0,0,0,15.94,6.36Z"/><circle class="cls-1" cx="7.54" cy="16.11" r="1.85"/><!--<path class="cls-1" d="M5.2,38.52v2H4.09V35.37H5.71c1.39,0,2.09.5,2.09,1.55a1.42,1.42,0,0,1-1,1.4l1.34,2.23H6.87l-1.11-2Zm.58-.78c.58,0,.89-.24.89-.82s-.31-.77-1-.77H5.2v1.59Z"/><path class="cls-1" d="M9.9,39.39l-.29,1.16H8.46l1.6-5.19H11.4L13,40.55H11.82l-.29-1.16Zm.81-3.21-.6,2.39h1.21Z"/><path class="cls-1" d="M17.87,37.94a2.3,2.3,0,0,1-2.55,2.62H13.84V35.37H15.2C16.57,35.37,17.87,35.79,17.87,37.94Zm-2.93,1.81h.45c.76,0,1.33-.35,1.33-1.81s-.61-1.76-1.36-1.76h-.43Z"/><path class="cls-1" d="M19.69,39.39l-.29,1.16H18.25l1.6-5.19h1.34l1.59,5.19H21.61l-.29-1.16Zm.81-3.21-.6,2.39h1.21Z"/><path class="cls-1" d="M24.74,38.52v2h-1.1V35.37h1.62c1.39,0,2.09.5,2.09,1.55a1.42,1.42,0,0,1-1,1.4l1.34,2.23H26.41l-1.11-2Zm.58-.78c.58,0,.89-.24.89-.82s-.31-.77-1-.77h-.49v1.59Z"/>--></g></g></svg>
\ No newline at end of file
diff --git a/interface/resources/icons/+android/radar-i.svg b/interface/resources/icons/+android/radar-i.svg
deleted file mode 100755
index 3994a775d3..0000000000
--- a/interface/resources/icons/+android/radar-i.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31.87 31.87"><defs><style type="text/css">.cls-1{fill:#afafaf;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M15.94,19.45a3.51,3.51,0,1,1,3.51-3.51A3.51,3.51,0,0,1,15.94,19.45Zm0-5.36a1.85,1.85,0,1,0,1.85,1.85A1.85,1.85,0,0,0,15.94,14.09Z"/><circle class="cls-1" cx="22.65" cy="20.94" r="1.85"/><path class="cls-1" d="M15.94,0A15.84,15.84,0,0,0,7.16,2.65,3.52,3.52,0,0,1,8.24,3.94,14.34,14.34,0,1,1,3.67,8.68a3.51,3.51,0,0,1-1.31-1A15.92,15.92,0,1,0,15.94,0Z"/><circle class="cls-1" cx="5.1" cy="5.48" r="1.85"/><path class="cls-1" d="M19.73,22.88A7.9,7.9,0,0,1,8.82,19.37a3.48,3.48,0,0,1-1.28.25,3.46,3.46,0,0,1-.46,0A9.55,9.55,0,0,0,21,24,3.52,3.52,0,0,1,19.73,22.88Z"/><path class="cls-1" d="M15.94,6.36a9.59,9.59,0,0,0-9,6.3,3.49,3.49,0,0,1,.59-.06,3.47,3.47,0,0,1,1.13.2,7.91,7.91,0,0,1,15,4.79,3.5,3.5,0,0,1,1.48.89A9.55,9.55,0,0,0,15.94,6.36Z"/><circle class="cls-1" cx="7.54" cy="16.11" r="1.85"/><!--<path class="cls-1" d="M5.2,38.52v2H4.09V35.37H5.71c1.39,0,2.09.5,2.09,1.55a1.42,1.42,0,0,1-1,1.4l1.34,2.23H6.87l-1.11-2Zm.58-.78c.58,0,.89-.24.89-.82s-.31-.77-1-.77H5.2v1.59Z"/><path class="cls-1" d="M9.9,39.39l-.29,1.16H8.46l1.6-5.19H11.4L13,40.55H11.82l-.29-1.16Zm.81-3.21-.6,2.39h1.21Z"/><path class="cls-1" d="M17.87,37.94a2.3,2.3,0,0,1-2.55,2.62H13.84V35.37H15.2C16.57,35.37,17.87,35.79,17.87,37.94Zm-2.93,1.81h.45c.76,0,1.33-.35,1.33-1.81s-.61-1.76-1.36-1.76h-.43Z"/><path class="cls-1" d="M19.69,39.39l-.29,1.16H18.25l1.6-5.19h1.34l1.59,5.19H21.61l-.29-1.16Zm.81-3.21-.6,2.39h1.21Z"/><path class="cls-1" d="M24.74,38.52v2h-1.1V35.37h1.62c1.39,0,2.09.5,2.09,1.55a1.42,1.42,0,0,1-1,1.4l1.34,2.23H26.41l-1.11-2Zm.58-.78c.58,0,.89-.24.89-.82s-.31-.77-1-.77h-.49v1.59Z"/>--></g></g></svg>
\ No newline at end of file
diff --git a/interface/resources/images/fly.png b/interface/resources/images/fly.png
index 0edfcab21bbe3f78c684a004a00d5c7ce7c5a3fe..02f72d568983840d96ee85c8fdc13775fac26919 100644
GIT binary patch
literal 8688
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

literal 11088
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

diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android/modesbar.qml
index 451921f155..642703017f 100644
--- a/interface/resources/qml/hifi/+android/modesbar.qml
+++ b/interface/resources/qml/hifi/+android/modesbar.qml
@@ -11,18 +11,6 @@ import ".."
 Item {
     id: modesbar
     y:20
-	Rectangle {
-        anchors.fill : parent
- 		color: "transparent"
-        Flow {
-            id: flowMain
-            spacing: 0
-            flow: Flow.TopToBottom
-            layoutDirection: Flow.TopToBottom
-            anchors.fill: parent
-            anchors.margins: 4
-        }
-	}
 
     Component.onCompleted: {
         width = 300; // That 30 is extra regardless the qty of items shown
@@ -35,7 +23,7 @@ Item {
         console.log("load button");
         if (component.status == Component.Ready) {
             console.log("load button 2");
-            var button = component.createObject(flowMain);
+            var button = component.createObject(modesbar);
             // copy all properites to button
             var keys = Object.keys(properties).forEach(function (key) {
                 button[key] = properties[key];
@@ -59,14 +47,12 @@ Item {
 
     function fromScript(message) {
         switch (message.type) {
-            case "allButtonsShown":
-                modesbar.height = flowMain.children.length * 300 + 30; // That 30 is extra regardless the qty of items shown
-            break;
-            case "inactiveButtonsHidden":
-                modesbar.height = 300 + 30;
-            break;
+            case "switch":
+                    // message.params.to
+                    // still not needed 
+                break;
             default:
-            break;
+                break;
         }
     }
 
diff --git a/scripts/system/+android/modes.js b/scripts/system/+android/modes.js
index c41ae1f327..a7c1060ffb 100644
--- a/scripts/system/+android/modes.js
+++ b/scripts/system/+android/modes.js
@@ -11,15 +11,21 @@
 //
 (function() { // BEGIN LOCAL_SCOPE
 
-var modesbar;
-var modesButtons;
-var currentSelectedBtn;
+var modeButton;
+var currentMode;
+var barQml;
 
 var SETTING_CURRENT_MODE_KEY = 'Android/Mode';
 var MODE_VR = "VR", MODE_RADAR = "RADAR", MODE_MY_VIEW = "MY VIEW";
 var DEFAULT_MODE = MODE_MY_VIEW;
-var logEnabled = true;
+var nextMode = {};
+nextMode[MODE_RADAR]=MODE_MY_VIEW;
+nextMode[MODE_MY_VIEW]=MODE_RADAR;
+var modeLabel = {};
+modeLabel[MODE_RADAR]="TOP VIEW";
+modeLabel[MODE_MY_VIEW]="MY VIEW";
 
+var logEnabled = false;
 var radar = Script.require('./radar.js');
 var uniqueColor = Script.require('./uniqueColor.js');
 
@@ -32,87 +38,30 @@ function printd(str) {
 function init() {
     radar.setUniqueColor(uniqueColor);
     radar.init();
-    setupModesBar();
-}
-
-function shutdown() {
-
-}
-
-function setupModesBar() {
-
-    var bar = new QmlFragment({
+    
+        barQml = new QmlFragment({
         qml: "hifi/modesbar.qml"
     });
-    var buttonRadarMode = bar.addButton({
-        icon: "icons/radar-i.svg",
-        activeIcon: "icons/radar-a.svg",
-        hoverIcon: "icons/radar-a.svg",
+    modeButton = barQml.addButton({
+        icon: "icons/myview-a.svg",
         activeBgOpacity: 0.0,
         hoverBgOpacity: 0.0,
         activeHoverBgOpacity: 0.0,
-        text: "RADAR",
+        text: "MODE",
         height:240,
         bottomMargin: 6,
         textSize: 45
     });
-    var buttonMyViewMode = bar.addButton({
-        icon: "icons/myview-i.svg",
-        activeIcon: "icons/myview-a.svg",
-        hoverIcon: "icons/myview-a.svg",
-        activeBgOpacity: 0.0,
-        hoverBgOpacity: 0.0,
-        activeHoverBgOpacity: 0.0,
-        text: "MY VIEW",
-        height: 240,
-        bottomMargin: 6,
-        textSize: 45
-    });
     
-    modesButtons = [buttonRadarMode, buttonMyViewMode];
+    switchToMode(getCurrentModeSetting());
 
-    var mode = getCurrentModeSetting();
-
-    var buttonsRevealed = false;
-    bar.sendToQml({type: "inactiveButtonsHidden"});
-
-    modesbar = {
-        restoreMyViewButton: function() {
-            switchModeButtons(buttonMyViewMode);
-            saveCurrentModeSetting(MODE_MY_VIEW);
-        },
-        sendToQml: function(o) { bar.sendToQml(o); },
-        qmlFragment: bar
-    };
-
-    buttonRadarMode.clicked.connect(function() {
-        //if (connections.isVisible()) return;
-        saveCurrentModeSetting(MODE_RADAR);
-        printd("Radar clicked");
-        onButtonClicked(buttonRadarMode, function() {
-            radar.startRadarMode();
-        });
-    });
-    buttonMyViewMode.clicked.connect(function() {
-        //if (connections.isVisible()) return;
-        saveCurrentModeSetting(MODE_MY_VIEW);
-        printd("My View clicked");
-        onButtonClicked(buttonMyViewMode, function() {
-            if (currentSelectedBtn == buttonRadarMode) {
-                radar.endRadarMode();
-            }
-        });
+    modeButton.clicked.connect(function() {    
+        switchToMode(nextMode[currentMode]);
     });
+}
 
-    var savedButton;
-    if (mode == MODE_MY_VIEW) {
-        savedButton = buttonMyViewMode;
-    } else {
-        savedButton = buttonRadarMode;
-    }
-    printd("[MODE] previous mode " + mode);
+function shutdown() {
 
-    savedButton.clicked();
 }
 
 function saveCurrentModeSetting(mode) {
@@ -123,62 +72,29 @@ function getCurrentModeSetting(mode) {
     return Settings.getValue(SETTING_CURRENT_MODE_KEY, DEFAULT_MODE);
 }
 
-function showAllButtons() {
-    for (var i=0; i<modesButtons.length; i++) {
-        modesButtons[i].visible = true;
+function switchToMode(newMode) {
+    // before leaving radar mode
+    if (currentMode == MODE_RADAR) {
+        radar.endRadarMode();
     }
-    buttonsRevealed = true;
-    print("Modesbar: " + modesbar);
-    modesbar.sendToQml({type: "allButtonsShown"});
-}
+    currentMode = newMode;
+    modeButton.text = modeLabel[currentMode];
 
-function hideAllButtons() {
-    for (var i=0; i<modesButtons.length; i++) {
-        modesButtons[i].visible = false;
-    }
-}
+    saveCurrentModeSetting(currentMode);
 
-function hideOtherButtons(thisButton) {
-    printd("Hiding all but " + thisButton);
-    printd("modesButtons: " + modesButtons.length);
-    for (var i=0; i<modesButtons.length; i++) {
-        if (modesButtons[i] != thisButton) {
-            printd("----Hiding " + thisButton);
-            modesButtons[i].visible = false;
-        } else {
-            // be sure to keep it visible
-            modesButtons[i].visible = true;
-        }
-    }
-    buttonsRevealed = false;
-    print("Modesbar: " + modesbar);
-    modesbar.sendToQml({type: "inactiveButtonsHidden"});
-}
-
-function switchModeButtons(clickedButton, hideAllAfter) {
-    if (currentSelectedBtn) {
-        currentSelectedBtn.isActive = false;
-    }
-    currentSelectedBtn = clickedButton;
-    clickedButton.isActive = true;
-    if (hideAllAfter) {
-        hideAllButtons();
+    if (currentMode == MODE_RADAR) {
+        radar.startRadarMode();
+    } else  if (currentMode == MODE_MY_VIEW) {
+        // nothing to do yet
     } else {
-        hideOtherButtons(clickedButton);
+        printd("Unknown view mode " + currentMode);
     }
+    
 }
 
-function onButtonClicked(clickedButton, whatToDo, hideAllAfter) {
-    if (currentSelectedBtn == clickedButton) {
-        if (buttonsRevealed) {
-            hideOtherButtons(clickedButton);
-        } else {
-            showAllButtons();
-        }
-    } else {
-        // mode change
-        whatToDo();
-        switchModeButtons(clickedButton, hideAllAfter);
+function sendToQml(o) {
+    if(barQml) {
+      barQml.sendToQml(o);  
     }
 }
 

From 865e3a05f1523e215f83cade886fcc19ad076133 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Wed, 11 Apr 2018 19:33:43 -0300
Subject: [PATCH 2/2] Move jump button to the right. Adjust position of buttons

---
 android/app/src/main/res/values/strings.xml                  | 2 +-
 interface/resources/qml/hifi/+android/ActionBar.qml          | 2 +-
 interface/resources/qml/hifi/+android/AudioBar.qml           | 4 ++--
 interface/resources/qml/hifi/+android/modesbar.qml           | 2 +-
 .../src/input-plugins/TouchscreenVirtualPadDevice.cpp        | 5 +++--
 libraries/ui/src/VirtualPadManager.cpp                       | 4 ++--
 libraries/ui/src/VirtualPadManager.h                         | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index f618fe805d..8f2d043f8d 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name" translatable="false">Interface</string>
-    <string name="go_to">Go To</string>
+    <string name="go_to">Home</string>
     <string name="web_view_action_open_in_browser" translatable="false">Open in browser</string>
     <string name="web_view_action_share" translatable="false">Share link</string>
     <string name="web_view_action_share_subject" translatable="false">Shared a link</string>
diff --git a/interface/resources/qml/hifi/+android/ActionBar.qml b/interface/resources/qml/hifi/+android/ActionBar.qml
index 7152c829bc..3bc4785e02 100644
--- a/interface/resources/qml/hifi/+android/ActionBar.qml
+++ b/interface/resources/qml/hifi/+android/ActionBar.qml
@@ -40,7 +40,7 @@ Item {
 
     Component.onCompleted: {
         // put on bottom
-        x = 50;
+        x = 30;
         y = 0;
         width = 300;
         height = 300;
diff --git a/interface/resources/qml/hifi/+android/AudioBar.qml b/interface/resources/qml/hifi/+android/AudioBar.qml
index a6d4e28813..0480d4ee4f 100644
--- a/interface/resources/qml/hifi/+android/AudioBar.qml
+++ b/interface/resources/qml/hifi/+android/AudioBar.qml
@@ -40,8 +40,8 @@ Item {
 
     Component.onCompleted: {
         // put on bottom
-        x = parent.width-300;
-        y = 0;
+        x = parent.width-315;
+        y = 5;
         width = 300;
         height = 300;
     }
diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android/modesbar.qml
index 642703017f..7736c589a1 100644
--- a/interface/resources/qml/hifi/+android/modesbar.qml
+++ b/interface/resources/qml/hifi/+android/modesbar.qml
@@ -15,7 +15,7 @@ Item {
     Component.onCompleted: {
         width = 300; // That 30 is extra regardless the qty of items shown
         height = 300;
-        x=parent.width - 540;
+        x=parent.width - 555;
     }
     
     function addButton(properties) {
diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
index 957104bd30..0f3002b8c1 100644
--- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
@@ -80,9 +80,10 @@ void TouchscreenVirtualPadDevice::setupControlsPositions(VirtualPad::Manager& vi
     virtualPadManager.getLeftVirtualPad()->setFirstTouch(_moveRefTouchPoint);
 
     // Jump button
-    float leftMargin = _screenDPI * VirtualPad::Manager::JUMP_BTN_LEFT_MARGIN_PIXELS / VirtualPad::Manager::DPI;
+    float jumpBtnPixelSize = _screenDPI * VirtualPad::Manager::JUMP_BTN_FULL_PIXELS / VirtualPad::Manager::DPI;
+    float rightMargin = _screenDPI * VirtualPad::Manager::JUMP_BTN_RIGHT_MARGIN_PIXELS / VirtualPad::Manager::DPI;
     float bottomMargin = _screenDPI * VirtualPad::Manager::JUMP_BTN_BOTTOM_MARGIN_PIXELS/ VirtualPad::Manager::DPI;
-    _jumpButtonPosition = glm::vec2( _jumpButtonRadius + leftMargin, eventScreen->size().height() - bottomMargin - _jumpButtonRadius - _extraBottomMargin);
+    _jumpButtonPosition = glm::vec2( eventScreen->size().width() - rightMargin - jumpBtnPixelSize, eventScreen->size().height() - bottomMargin - _jumpButtonRadius - _extraBottomMargin);
     virtualPadManager.setJumpButtonPosition(_jumpButtonPosition);
 }
 
diff --git a/libraries/ui/src/VirtualPadManager.cpp b/libraries/ui/src/VirtualPadManager.cpp
index c786110bdf..1c76672827 100644
--- a/libraries/ui/src/VirtualPadManager.cpp
+++ b/libraries/ui/src/VirtualPadManager.cpp
@@ -39,9 +39,9 @@ namespace VirtualPad {
     const float Manager::BASE_MARGIN_PIXELS = 59.0f;
     const float Manager::STICK_RADIUS_PIXELS = 105.0f;
     const float Manager::JUMP_BTN_TRIMMED_RADIUS_PIXELS = 67.0f;
-    const float Manager::JUMP_BTN_FULL_PIXELS = 134.0f;
+    const float Manager::JUMP_BTN_FULL_PIXELS = 164.0f;
     const float Manager::JUMP_BTN_BOTTOM_MARGIN_PIXELS = 67.0f;
-    const float Manager::JUMP_BTN_LEFT_MARGIN_PIXELS = 547.0f;
+    const float Manager::JUMP_BTN_RIGHT_MARGIN_PIXELS = 20.0f;
 
     Manager::Manager() {
 
diff --git a/libraries/ui/src/VirtualPadManager.h b/libraries/ui/src/VirtualPadManager.h
index 68b3d4f10f..6f7fbcc921 100644
--- a/libraries/ui/src/VirtualPadManager.h
+++ b/libraries/ui/src/VirtualPadManager.h
@@ -54,7 +54,7 @@ namespace VirtualPad {
         static const float JUMP_BTN_TRIMMED_RADIUS_PIXELS;
         static const float JUMP_BTN_FULL_PIXELS;
         static const float JUMP_BTN_BOTTOM_MARGIN_PIXELS;
-        static const float JUMP_BTN_LEFT_MARGIN_PIXELS;
+        static const float JUMP_BTN_RIGHT_MARGIN_PIXELS;
 
     private:
         Instance _leftVPadInstance;