Android: Differ between ShowMaximized and ShowFullScreen

The default is now ShowMaximized which behaves as it did before,
i.e. each window will fill the screen but the status bar will be
visible. Calling showFullScreen() explicitly will now hide the
status bar to maximize the amount of screen real estate occupied
by the application.

Task-number: QTBUG-33135
Change-Id: If0d0a2ab72f8026e76818290e2b953dbc0dec156
Reviewed-by: BogDan Vatra <bogdan@kde.org>

3 files changed, 6 insertions, 1 deletions

diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index e583606e41..08a3b63ee4 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -343,6 +343,8 @@ QVariant QPlatformIntegration::styleHint(StyleHint hint) const
         return QPlatformTheme::defaultThemeHint(QPlatformTheme::StartDragTime);
     case ShowIsFullScreen:
         return false;
+    case ShowIsMaximized:
+        return false;
     case PasswordMaskDelay:
         return QPlatformTheme::defaultThemeHint(QPlatformTheme::PasswordMaskDelay);
     case PasswordMaskCharacter:
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index 4be675a37a..d397270c10 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -147,7 +147,8 @@ public:
         UseRtlExtensions,
         SynthesizeMouseFromTouchEvents,
         PasswordMaskCharacter,
-        SetFocusOnTouchRelease
+        SetFocusOnTouchRelease,
+        ShowIsMaximized
     };
 
     virtual QVariant styleHint(StyleHint hint) const;
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index a3841d3cfb..e0e1638d75 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1657,6 +1657,8 @@ void QWindow::show()
     bool isPopup = d_func()->windowFlags & Qt::Popup & ~Qt::Window;
     if (!isPopup && qApp->styleHints()->showIsFullScreen())
         showFullScreen();
+    else if (!isPopup && QGuiApplicationPrivate::platformIntegration()->styleHint(QPlatformIntegration::ShowIsMaximized).toBool())
+        showMaximized();
     else
         showNormal();
 }