QGuiApplication on Android can now detect multiple displays

- Extending QtNative.java with access to DisplayManager and get
  details about available displays
- Extending Android Platform Integration with display's list
  handling
- Change QAndroidPlatformScreen to initialize itself from QJniObject
  representation of an android Display object
- Move initialization of Primary display from QAndroidPlatformScreen
  to QAndroidPlatformIntegration

Change-Id: I3d8f97f5cf9f81bbecc8716c25ff323097e57a15
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 ef8371e72d..390bda0416 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -24,7 +24,7 @@ class QAndroidPlatformScreen: public QObject, public QPlatformScreen, public And
 {
     Q_OBJECT
 public:
-    QAndroidPlatformScreen();
+    QAndroidPlatformScreen(const QJniObject &displayObject);
     ~QAndroidPlatformScreen();
 
     QRect geometry() const override { return QRect(QPoint(), m_size); }
@@ -38,7 +38,6 @@ 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;
     QWindow *topLevelAt(const QPoint & p) const override;
 
@@ -94,7 +93,7 @@ private slots:
     void doRedraw(QImage *screenGrabImage = nullptr);
 
 private:
-    int m_id = -1;
+    int m_surfaceId = -1;
     QAtomicInt m_rasterSurfaces = 0;
     ANativeWindow* m_nativeSurface = nullptr;
     QWaitCondition m_surfaceWaitCondition;