1 files changed, 13 insertions, 26 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index 96c4bfa06f1..c4245998772 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -56,15 +56,12 @@ void QAndroidPlatformWindow::initialize()
             isForeignWindow(), m_nativeParentQtWindow, listener);
     m_nativeViewId = m_nativeQtWindow.callMethod<jint>("getId");
 
-    m_windowFlags = Qt::Widget;
-    m_windowState = Qt::WindowNoState;
     // the surfaceType is overwritten in QAndroidPlatformOpenGLWindow ctor so let's save
     // the fact that it's a raster window for now
     m_isRaster = window->surfaceType() == QSurface::RasterSurface;
-    setWindowState(window->windowStates());
 
     // the following is in relation to the virtual geometry
-    const bool forceMaximize = m_windowState & (Qt::WindowMaximized | Qt::WindowFullScreen);
+    const bool forceMaximize = window->windowStates() & (Qt::WindowMaximized | Qt::WindowFullScreen);
     const QRect nativeScreenGeometry = platformScreen()->availableGeometry();
     if (forceMaximize) {
         setGeometry(nativeScreenGeometry);
@@ -123,7 +120,7 @@ void QAndroidPlatformWindow::raise()
         QWindowSystemInterface::handleFocusWindowChanged(window(), Qt::ActiveWindowFocusReason);
         return;
     }
-    updateSystemUiVisibility();
+    updateSystemUiVisibility(window()->windowStates(), window()->flags());
     platformScreen()->raise(this);
 }
 
@@ -167,13 +164,13 @@ void QAndroidPlatformWindow::setVisible(bool visible)
         if (!visible && window() == qGuiApp->focusWindow()) {
             platformScreen()->topVisibleWindowChanged();
         } else {
-            updateSystemUiVisibility();
-            if ((m_windowState & Qt::WindowFullScreen)
-                || (window()->flags() & Qt::ExpandedClientAreaHint)) {
+            const Qt::WindowStates states = window()->windowStates();
+            const Qt::WindowFlags flags = window()->flags();
+            updateSystemUiVisibility(states, flags);
+            if (states & Qt::WindowFullScreen || flags & Qt::ExpandedClientAreaHint)
                 setGeometry(platformScreen()->geometry());
-            } else if (m_windowState & Qt::WindowMaximized) {
+            else if (states & Qt::WindowMaximized)
                 setGeometry(platformScreen()->availableGeometry());
-            }
             requestActivateWindow();
         }
     }
@@ -188,27 +185,18 @@ void QAndroidPlatformWindow::setVisible(bool visible)
 
 void QAndroidPlatformWindow::setWindowState(Qt::WindowStates state)
 {
-    if (m_windowState == state)
-        return;
-
     QPlatformWindow::setWindowState(state);
-    m_windowState = state;
 
     if (window()->isVisible())
-        updateSystemUiVisibility();
+        updateSystemUiVisibility(state, window()->flags());
 }
 
 void QAndroidPlatformWindow::setWindowFlags(Qt::WindowFlags flags)
 {
-    if (m_windowFlags == flags)
-        return;
+    QPlatformWindow::setWindowFlags(flags);
 
-    m_windowFlags = flags;
-}
-
-Qt::WindowFlags QAndroidPlatformWindow::windowFlags() const
-{
-    return m_windowFlags;
+    if (window()->isVisible())
+        updateSystemUiVisibility(window()->windowStates(), flags);
 }
 
 void QAndroidPlatformWindow::setParent(const QPlatformWindow *window)
@@ -256,16 +244,15 @@ void QAndroidPlatformWindow::requestActivateWindow()
         raise();
 }
 
-void QAndroidPlatformWindow::updateSystemUiVisibility()
+void QAndroidPlatformWindow::updateSystemUiVisibility(Qt::WindowStates states, Qt::WindowFlags flags)
 {
-    const int flags = window()->flags();
     const bool isNonRegularWindow = flags & (Qt::Popup | Qt::Dialog | Qt::Sheet) & ~Qt::Window;
     if (!isNonRegularWindow) {
         auto iface = qGuiApp->nativeInterface<QNativeInterface::QAndroidApplication>();
         iface->runOnAndroidMainThread([=]() {
             using namespace QtJniTypes;
             auto activity = iface->context().object<Activity>();
-            if (m_windowState & Qt::WindowFullScreen)
+            if (states & Qt::WindowFullScreen)
                 QtWindowInsetsController::callStaticMethod("showFullScreen", activity);
             else if (flags & Qt::ExpandedClientAreaHint)
                 QtWindowInsetsController::callStaticMethod("showExpanded", activity);