1 files changed, 31 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp
index 4934047af9..6ed805174b 100644
--- a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp
+++ b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp
@@ -41,6 +41,7 @@
 
 #include "qandroidopenglplatformwindow.h"
 #include "androidjnimain.h"
+#include "qandroidplatformintegration.h"
 #include <qpa/qwindowsysteminterface.h>
 
 QT_BEGIN_NAMESPACE
@@ -52,6 +53,7 @@ QBasicAtomicInt QAndroidOpenGLPlatformWindow::m_referenceCount = Q_BASIC_ATOMIC_
 
 QAndroidOpenGLPlatformWindow::QAndroidOpenGLPlatformWindow(QWindow *window)
     : QEglFSWindow(window)
+    , m_state(Qt::WindowNoState)
 {
 }
 
@@ -110,7 +112,9 @@ void QAndroidOpenGLPlatformWindow::resetSurface()
 
     {
         lock();
-        scheduleResize(QtAndroid::nativeWindowSize());
+        // Use the desktop size.
+        // On some devices, the getters for the native window size gives wrong values
+        scheduleResize(QAndroidPlatformIntegration::defaultDesktopSize());
         QWindowSystemInterface::handleExposeEvent(window(), QRegion(geometry())); // Expose event
         unlock();
     }
@@ -128,12 +132,38 @@ void QAndroidOpenGLPlatformWindow::destroy()
     }
 }
 
+void QAndroidOpenGLPlatformWindow::updateStatusBarVisibility()
+{
+    Qt::WindowFlags flags = window()->flags();
+    bool isNonRegularWindow = flags & (Qt::Popup | Qt::Dialog | Qt::Sheet) & ~Qt::Window;
+    if (!isNonRegularWindow) {
+        if (m_state & Qt::WindowFullScreen)
+            QtAndroid::hideStatusBar();
+        else if (m_state & Qt::WindowMaximized)
+            QtAndroid::showStatusBar();
+    }
+}
+
 void QAndroidOpenGLPlatformWindow::raise()
 {
+    updateStatusBarVisibility();
+}
+
+void QAndroidOpenGLPlatformWindow::setWindowState(Qt::WindowState state)
+{
+    if (m_state == state)
+        return;
+
+    m_state = state;
+    if (window()->isVisible())
+        updateStatusBarVisibility();
 }
 
 void QAndroidOpenGLPlatformWindow::setVisible(bool visible)
 {
+    if (visible)
+        updateStatusBarVisibility();
+
     QEglFSWindow::setVisible(visible);
 
     // The Android Activity is activated before Qt is initialized, causing the application state to