Add button layout for dialogs on Android

It used macOS layout before, but it differs from the actual layout in
Android/Material Design: affirmative actions are on the right side,
dismissive actions are directly to the left of the affirmative actions
and neutral actions are on the left side.

[ChangeLog][Platform-specific Changes][Android] Android dialogs now have
more appropriate button layout, with affirmative actions on the right.

Task-number: QTBUG-58060
Change-Id: I0755f80261410c64cf4f854b7f2a72e2d959db28
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

2 files changed, 6 insertions, 2 deletions

diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index a3e55114bb..ad16acb96c 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -577,6 +577,8 @@ QDialogButtonBox::~QDialogButtonBox()
     \value MacLayout Use a policy appropriate for applications on \macos.
     \value KdeLayout Use a policy appropriate for applications on KDE.
     \value GnomeLayout Use a policy appropriate for applications on GNOME.
+    \value AndroidLayout Use a policy appropriate for applications on Android.
+                            This enum value was added in Qt 5.10.
 
     The button layout is specified by the \l{style()}{current style}. However,
     on the X11 platform, it may be influenced by the desktop environment.
diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h
index af9e705234..02d14dee7c 100644
--- a/src/widgets/widgets/qdialogbuttonbox.h
+++ b/src/widgets/widgets/qdialogbuttonbox.h
@@ -108,11 +108,13 @@ public:
     Q_FLAG(StandardButtons)
 
     enum ButtonLayout {
-        // keep this in sync with QMessageBox::ButtonLayout and QPlatformDialogHelper::ButtonLayout
+        // keep this in sync with QPlatformDialogHelper::ButtonLayout
         WinLayout,
         MacLayout,
         KdeLayout,
-        GnomeLayout
+        GnomeLayout,
+        // MacModelessLayout,
+        AndroidLayout = GnomeLayout + 2 // ### Qt 6: reorder
     };
 
     QDialogButtonBox(QWidget *parent = Q_NULLPTR);