Android: Hide AvdDialog in cpp

Rename it to avdcreatordialog.h.
Provide executeAvdCreatorDialog() global function.

Change-Id: Ib633dc75e94dcef8a8348d37fb2456661d9ade66
Reviewed-by: hjk <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 84977d53962..316e2470396 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -9,7 +9,7 @@
 #include "androidsignaloperation.h"
 #include "androidtr.h"
 #include "androidutils.h"
-#include "avddialog.h"
+#include "avdcreatordialog.h"
 #include "avdmanageroutputparser.h"
 
 #include <coreplugin/icore.h>
@@ -1053,11 +1053,11 @@ public:
                 return IDevice::Ptr();
             }
 
-            AvdDialog dialog = AvdDialog(Core::ICore::dialogParent());
-            if (dialog.exec() != QDialog::Accepted)
+            const auto info = executeAvdCreatorDialog();
+            if (!info)
                 return IDevice::Ptr();
 
-            const IDevice::Ptr dev = createDeviceFromInfo(dialog.avdInfo());
+            const IDevice::Ptr dev = createDeviceFromInfo(*info);
             if (const auto androidDev = static_cast<AndroidDevice *>(dev.get())) {
                 qCDebug(androidDeviceLog, "Created new Android AVD id \"%s\".",
                         qPrintable(androidDev->avdName()));