From 242b009562de3f10c7b9f58a35d9a59883369e62 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Fri, 23 Mar 2018 18:59:55 -0300
Subject: [PATCH] Android - Use mouse events for interacting with UI. Now
 LoginDialog UI interation does not move radar camera. Remove repeated tooggle
 call in audio.js. Adapt button to simulated mouse events.

---
 .../resources/qml/hifi/+android/button.qml    |  4 +-
 libraries/qml/src/qml/OffscreenSurface.cpp    | 37 +++++++++++++------
 scripts/system/+android/audio.js              |  1 -
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/interface/resources/qml/hifi/+android/button.qml b/interface/resources/qml/hifi/+android/button.qml
index 4822b6bf33..3e9ce39351 100644
--- a/interface/resources/qml/hifi/+android/button.qml
+++ b/interface/resources/qml/hifi/+android/button.qml
@@ -118,7 +118,7 @@ Item {
                 tabletRoot.playButtonClickSound();
             }*/
         }
-        onEntered: {
+        onPressed: {
             button.isEntered = true;
             button.entered();
             if (button.isActive) {
@@ -127,7 +127,7 @@ Item {
                 button.state = "hover state";
             }
         }
-        onExited: {
+        onReleased: {
             button.isEntered = false;
             button.exited()
             if (button.isActive) {
diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp
index 6580c5b1e8..ff36589b61 100644
--- a/libraries/qml/src/qml/OffscreenSurface.cpp
+++ b/libraries/qml/src/qml/OffscreenSurface.cpp
@@ -166,18 +166,33 @@ bool OffscreenSurface::eventFilter(QObject* originalDestination, QEvent* event)
         case QEvent::TouchUpdate:
         case QEvent::TouchEnd: {
             QTouchEvent *originalEvent = static_cast<QTouchEvent *>(event);
-            QTouchEvent fakeEvent(*originalEvent);
-            auto newTouchPoints = fakeEvent.touchPoints();
-            for (size_t i = 0; i < newTouchPoints.size(); ++i) {
-                const auto &originalPoint = originalEvent->touchPoints()[i];
-                auto &newPoint = newTouchPoints[i];
-                newPoint.setPos(originalPoint.pos());
+            QEvent::Type fakeMouseEventType = QEvent::None;
+            Qt::MouseButton fakeMouseButton = Qt::NoButton;
+            Qt::MouseButtons fakeMouseButtons = Qt::NoButton;
+            switch (event->type()) {
+                case QEvent::TouchBegin:
+                    fakeMouseEventType = QEvent::MouseButtonPress;
+                    fakeMouseButton = Qt::LeftButton;
+                    fakeMouseButtons = Qt::LeftButton;
+                    break;
+                case QEvent::TouchUpdate:
+                    fakeMouseEventType = QEvent::MouseMove;
+                    fakeMouseButton = Qt::LeftButton;
+                    fakeMouseButtons = Qt::LeftButton;
+                    break;
+                case QEvent::TouchEnd:
+                    fakeMouseEventType = QEvent::MouseButtonRelease;
+                    fakeMouseButton = Qt::LeftButton;
+                    fakeMouseButtons = Qt::NoButton;
+                    break;
             }
-            fakeEvent.setTouchPoints(newTouchPoints);
-            if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &fakeEvent)) {
-                qInfo() << __FUNCTION__ << "sent fake touch event:" << fakeEvent.type()
-                        << "_quickWindow handled it... accepted:" << fakeEvent.isAccepted();
-                return false; //event->isAccepted();
+            if (fakeMouseEventType == QEvent::None) break;
+            QMouseEvent fakeMouseEvent(fakeMouseEventType, originalEvent->touchPoints()[0].pos(), fakeMouseButton, fakeMouseButtons, Qt::NoModifier);
+            fakeMouseEvent.ignore();
+            if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &fakeMouseEvent)) {
+                qInfo() << __FUNCTION__ << "sent fake touch event:" << fakeMouseEvent.type()
+                        << "_quickWindow handled it... accepted:" << fakeMouseEvent.isAccepted();
+                return fakeMouseEvent.isAccepted();
             }
             break;
         }
diff --git a/scripts/system/+android/audio.js b/scripts/system/+android/audio.js
index b4f156d4bf..955f74d63a 100644
--- a/scripts/system/+android/audio.js
+++ b/scripts/system/+android/audio.js
@@ -46,7 +46,6 @@ function onMuteClicked() {
     printd("On Mute Clicked");
     //Menu.setIsOptionChecked("Mute Microphone", !Menu.isOptionChecked("Mute Microphone"));
     Audio.muted = !Audio.muted;
-    onMuteToggled();
 }
 
 function onMuteToggled() {