From fedc0a9e61bd55d83745930ef5b6c4c1c54e0c5f Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Mon, 25 Jun 2018 16:37:03 -0300 Subject: [PATCH 01/25] Support web3d overlays in android --- android/app/src/main/AndroidManifest.xml | 1 + android/app/src/main/cpp/native.cpp | 29 +++++++- .../hifiinterface/InterfaceActivity.java | 34 ++++++--- .../hifiinterface/WebViewActivity.java | 18 +---- .../resources/qml/+android/Web3DOverlay.qml | 36 +++++++++ interface/src/AndroidHelper.cpp | 16 +++- interface/src/AndroidHelper.h | 5 +- .../scripting/WindowScriptingInterface.cpp | 5 ++ scripts/system/+android/clickOverlays.js | 73 +++++++++++++++++++ 9 files changed, 185 insertions(+), 32 deletions(-) create mode 100644 interface/resources/qml/+android/Web3DOverlay.qml create mode 100644 scripts/system/+android/clickOverlays.js diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e763d471cb..cd2c4e7f4f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,6 +29,7 @@