1 files changed, 10 insertions, 35 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h
index ef8371e72d..d850d0db09 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -5,26 +5,26 @@
 #ifndef QANDROIDPLATFORMSCREEN_H
 #define QANDROIDPLATFORMSCREEN_H
 
-#include "androidsurfaceclient.h"
-
 #include <QList>
 #include <QPainter>
 #include <QTimer>
 #include <QWaitCondition>
 #include <QtCore/QJniObject>
 #include <qpa/qplatformscreen.h>
-
-#include <android/native_window.h>
+#include <QtGui/qscreen_platform.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidPlatformWindow;
 
-class QAndroidPlatformScreen: public QObject, public QPlatformScreen, public AndroidSurfaceClient
+
+class QAndroidPlatformScreen : public QObject,
+                               public QPlatformScreen,
+                               public QNativeInterface::QAndroidScreen
 {
     Q_OBJECT
 public:
-    QAndroidPlatformScreen();
+    QAndroidPlatformScreen(const QJniObject &displayObject);
     ~QAndroidPlatformScreen();
 
     QRect geometry() const override { return QRect(QPoint(), m_size); }
@@ -38,22 +38,17 @@ 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;
 
-    // compositor api
     void addWindow(QAndroidPlatformWindow *window);
     void removeWindow(QAndroidPlatformWindow *window);
     void raise(QAndroidPlatformWindow *window);
     void lower(QAndroidPlatformWindow *window);
-
-    void scheduleUpdate();
-    void topWindowChanged(QWindow *w);
-    int rasterSurfaces();
+    void topVisibleWindowChanged();
+    int displayId() const override;
 
 public slots:
-    void setDirty(const QRect &rect);
     void setPhysicalSize(const QSize &size);
     void setAvailableGeometry(const QRect &rect);
     void setSize(const QSize &size);
@@ -63,13 +58,8 @@ public slots:
     void setOrientation(Qt::ScreenOrientation orientation);
 
 protected:
-    bool event(QEvent *event) override;
-
     typedef QList<QAndroidPlatformWindow *> WindowStackType;
     WindowStackType m_windowStack;
-    QRect m_dirtyRect;
-    bool m_updatePending = false;
-
     QRect m_availableGeometry;
     int m_depth;
     QImage::Format m_format;
@@ -78,31 +68,16 @@ protected:
     QString m_name;
     QList<Mode> m_modes;
     int m_currentMode = 0;
+    int m_displayId = -1;
 
 private:
     QDpi logicalDpi() const override;
     QDpi logicalBaseDpi() const override;
     Qt::ScreenOrientation orientation() const override;
     Qt::ScreenOrientation nativeOrientation() const override;
-    QPixmap grabWindow(WId window, int x, int y, int width, int height) const override;
-    void surfaceChanged(JNIEnv *env, jobject surface, int w, int h) override;
-    void releaseSurface();
     void applicationStateChanged(Qt::ApplicationState);
-    QPixmap doScreenShot(QRect grabRect = QRect());
-
-private slots:
-    void doRedraw(QImage *screenGrabImage = nullptr);
-
 private:
-    int m_id = -1;
-    QAtomicInt m_rasterSurfaces = 0;
-    ANativeWindow* m_nativeSurface = nullptr;
-    QWaitCondition m_surfaceWaitCondition;
     QSize m_size;
-
-    QImage m_lastScreenshot;
-    QImage::Format m_pixelFormat = QImage::Format_RGBA8888_Premultiplied;
-    bool m_repaintOccurred = false;
 };
 
 QT_END_NAMESPACE