Android: Make QtLayout per window instead of per screen

Each QAndroidPlatformWindow has its own QtLayout,
instead of one for the whole app/screen. This paves the
way for addition of child windows.

Task-number: QTBUG-116187
Change-Id: I36c68cea1a5f27ded3696bcfc2fbc04d9a8ce79e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h
index 0e2f788886..e7ce6ed59f 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -37,7 +37,7 @@ public:
     int currentMode() const override { return m_currentMode; }
     int preferredMode() const override { return m_currentMode; }
     qreal refreshRate() const override { return m_refreshRate; }
-    inline QWindow *topWindow() const;
+    inline QWindow *topVisibleWindow() const;
     QWindow *topLevelAt(const QPoint & p) const override;
 
     void addWindow(QAndroidPlatformWindow *window);
@@ -45,7 +45,7 @@ public:
     void raise(QAndroidPlatformWindow *window);
     void lower(QAndroidPlatformWindow *window);
 
-    void topWindowChanged(QWindow *w);
+    void topVisibleWindowChanged();
     int displayId() const override;
 
 public slots:
@@ -60,7 +60,6 @@ public slots:
 protected:
     typedef QList<QAndroidPlatformWindow *> WindowStackType;
     WindowStackType m_windowStack;
-
     QRect m_availableGeometry;
     int m_depth;
     QImage::Format m_format;