1 files changed, 53 insertions, 36 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformforeignwindow.cpp b/src/plugins/platforms/android/qandroidplatformforeignwindow.cpp
index c2ce2c84b2..e84a481a2b 100644
--- a/src/plugins/platforms/android/qandroidplatformforeignwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformforeignwindow.cpp
@@ -6,84 +6,101 @@
 #include <QtCore/qvariant.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <QtCore/private/qjnihelpers_p.h>
+#include <QtCore/qjnitypes.h>
 
 QT_BEGIN_NAMESPACE
 
 QAndroidPlatformForeignWindow::QAndroidPlatformForeignWindow(QWindow *window, WId nativeHandle)
-    : QAndroidPlatformWindow(window),
-      m_surfaceId(-1)
+    : QAndroidPlatformWindow(window), m_view(nullptr), m_nativeViewInserted(false)
 {
     m_view = reinterpret_cast<jobject>(nativeHandle);
-    if (m_view.isValid())
-        QtAndroid::setViewVisibility(m_view.object(), false);
-}
+    if (isEmbeddingContainer()) {
+        m_nativeViewId = m_view.callMethod<jint>("getId");
+        return;
+    }
 
-QAndroidPlatformForeignWindow::~QAndroidPlatformForeignWindow()
-{
     if (m_view.isValid())
         QtAndroid::setViewVisibility(m_view.object(), false);
-    if (m_surfaceId != -1)
-        QtAndroid::destroySurface(m_surfaceId);
 }
 
-void QAndroidPlatformForeignWindow::lower()
+QAndroidPlatformForeignWindow::~QAndroidPlatformForeignWindow()
 {
-    if (m_surfaceId == -1)
+    if (isEmbeddingContainer())
         return;
 
-    QAndroidPlatformWindow::lower();
-    QtAndroid::bringChildToBack(m_surfaceId);
-}
+    if (m_view.isValid())
+        QtAndroid::setViewVisibility(m_view.object(), false);
 
-void QAndroidPlatformForeignWindow::raise()
-{
-    if (m_surfaceId == -1)
-        return;
+    m_nativeQtWindow.callMethod<void>("removeNativeView");
 
-    QAndroidPlatformWindow::raise();
-    QtAndroid::bringChildToFront(m_surfaceId);
 }
 
 void QAndroidPlatformForeignWindow::setGeometry(const QRect &rect)
 {
     QAndroidPlatformWindow::setGeometry(rect);
 
-    if (m_surfaceId != -1)
-        QtAndroid::setSurfaceGeometry(m_surfaceId, rect);
+    if (isEmbeddingContainer())
+        return;
+
+    if (m_nativeViewInserted)
+        setNativeGeometry(rect);
 }
 
 void QAndroidPlatformForeignWindow::setVisible(bool visible)
 {
+    if (isEmbeddingContainer()) {
+        QAndroidPlatformWindow::setVisible(visible);
+        return;
+    }
+
     if (!m_view.isValid())
         return;
 
     QtAndroid::setViewVisibility(m_view.object(), visible);
 
-    QAndroidPlatformWindow::setVisible(visible);
-    if (!visible && m_surfaceId != -1) {
-        QtAndroid::destroySurface(m_surfaceId);
-        m_surfaceId = -1;
-    } else if (m_surfaceId == -1) {
-        m_surfaceId = QtAndroid::insertNativeView(m_view.object(), geometry());
+    if (!visible && m_nativeViewInserted) {
+        m_nativeQtWindow.callMethod<void>("removeNativeView");
+        m_nativeViewInserted = false;
+    } else if (!m_nativeViewInserted) {
+        addViewToWindow();
     }
 }
 
 void QAndroidPlatformForeignWindow::applicationStateChanged(Qt::ApplicationState state)
 {
-    if (state <= Qt::ApplicationHidden
-            && m_surfaceId != -1) {
-        QtAndroid::destroySurface(m_surfaceId);
-        m_surfaceId = -1;
-    } else if (m_view.isValid() && m_surfaceId == -1){
-        m_surfaceId = QtAndroid::insertNativeView(m_view.object(), geometry());
+    if (!isEmbeddingContainer()) {
+        if (state <= Qt::ApplicationHidden
+                && m_nativeViewInserted) {
+            m_nativeQtWindow.callMethod<void>("removeNativeView");
+            m_nativeViewInserted = false;
+        } else if (m_view.isValid() && !m_nativeViewInserted){
+            addViewToWindow();
+        }
     }
 
     QAndroidPlatformWindow::applicationStateChanged(state);
 }
 
-void QAndroidPlatformForeignWindow::setParent(const QPlatformWindow *window)
+WId QAndroidPlatformForeignWindow::winId() const
 {
-    Q_UNUSED(window);
+    if (isEmbeddingContainer() && m_view.isValid())
+        return reinterpret_cast<WId>(m_view.object());
+    if (m_nativeQtWindow.isValid())
+        return reinterpret_cast<WId>(m_nativeQtWindow.object());
+    return 0L;
+}
+
+void QAndroidPlatformForeignWindow::addViewToWindow()
+{
+    if (isEmbeddingContainer())
+        return;
+
+    jint x = 0, y = 0, w = -1, h = -1;
+    if (!geometry().isNull())
+        geometry().getRect(&x, &y, &w, &h);
+
+    m_nativeQtWindow.callMethod<void>("setNativeView", m_view, x, y, qMax(w, 1), qMax(h, 1));
+    m_nativeViewInserted = true;
 }
 
 QT_END_NAMESPACE