Android: Rework BuildApkWidget

Merge BuildApkInnerWidget into BuildApkWidget and simplify
layout structure. The inner .ui managed three of the groupboxes,
the outer added two more manually.

Change-Id: If4b54fa569952a9bb5eedb889a271827d8a88577
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

5 files changed, 246 insertions, 446 deletions

diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index 3e8d577740b..f0a952c622a 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -101,7 +101,6 @@ FORMS += \
     addnewavddialog.ui \
     androidcreatekeystorecertificate.ui \
     androiddevicedialog.ui \
-    androidbuildapkwidget.ui \
     adbcommandswidget.ui \
     androidsdkmanagerwidget.ui
 
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index bcdb8a2e619..1c6ed28a414 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -36,7 +36,6 @@ Project {
             "androidbuildapkstep.h",
             "androidbuildapkwidget.cpp",
             "androidbuildapkwidget.h",
-            "androidbuildapkwidget.ui",
             "androiddeployqtstep.cpp",
             "androiddeployqtstep.h",
             "androiddebugsupport.cpp",
diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp
index d0d44d70bfc..516685e14fa 100644
--- a/src/plugins/android/androidbuildapkwidget.cpp
+++ b/src/plugins/android/androidbuildapkwidget.cpp
@@ -24,14 +24,15 @@
 **
 ****************************************************************************/
 
-#include "androidbuildapkstep.h"
 #include "androidbuildapkwidget.h"
+
+#include "androidbuildapkstep.h"
 #include "androidconfigurations.h"
+#include "androidextralibrarylistmodel.h"
 #include "androidcreatekeystorecertificate.h"
 #include "androidmanager.h"
 #include "androidsdkmanager.h"
 #include "createandroidmanifestwizard.h"
-#include "ui_androidbuildapkwidget.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
@@ -45,8 +46,10 @@
 #include <utils/pathchooser.h>
 #include <utils/utilsicons.h>
 
-#include <QFileDialog>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QGroupBox>
+#include <QFileDialog>
 #include <QLabel>
 #include <QListView>
 #include <QPushButton>
@@ -56,260 +59,297 @@
 #include <algorithm>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace Android {
 namespace Internal {
 
-AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step)
-    : ProjectExplorer::BuildStepConfigWidget(step),
-      m_ui(new Ui::AndroidBuildApkWidget),
-      m_step(step)
+AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
+    : BuildStepConfigWidget(step), m_step(step)
 {
-    m_ui->setupUi(this);
     setDisplayName("<b>" + tr("Build Android APK") + "</b>");
     setSummaryText(displayName());
 
-    // Target sdk combobox
+    auto vbox = new QVBoxLayout(this);
+    vbox->addWidget(createSignPackageGroup());
+    vbox->addWidget(createApplicationGroup());
+    vbox->addWidget(createAdvancedGroup());
+    vbox->addWidget(createCreateTemplatesGroup());
+    vbox->addWidget(createAdditionalLibrariesGroup());
+
+    connect(m_step->buildConfiguration(), &BuildConfiguration::buildTypeChanged,
+            this, &AndroidBuildApkWidget::updateSigningWarning);
+
+    connect(m_signPackageCheckBox, &QAbstractButton::clicked,
+            m_addDebuggerCheckBox, &QWidget::setEnabled);
+
+    signPackageCheckBoxToggled(m_step->signPackage());
+    updateSigningWarning();
+}
+
+QWidget *AndroidBuildApkWidget::createApplicationGroup()
+{
     const int minApiSupported = AndroidManager::apiLevelRange().first;
     QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::sdkManager()->
                                                           filteredSdkPlatforms(minApiSupported));
     targets.removeDuplicates();
-    m_ui->targetSDKComboBox->addItems(targets);
-    m_ui->targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::buildTargetSDK(step->target())));
-
-    // Ministro
-    if (m_step->useMinistro())
-        m_ui->ministroOption->setChecked(true);
-
-    // signing
-    m_ui->signPackageCheckBox->setChecked(m_step->signPackage());
-    m_ui->KeystoreLocationPathChooser->setExpectedKind(Utils::PathChooser::File);
-    m_ui->KeystoreLocationPathChooser->lineEdit()->setReadOnly(true);
-    m_ui->KeystoreLocationPathChooser->setPath(m_step->keystorePath().toUserOutput());
-    m_ui->KeystoreLocationPathChooser->setInitialBrowsePathBackup(QDir::homePath());
-    m_ui->KeystoreLocationPathChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)"));
-    m_ui->KeystoreLocationPathChooser->setPromptDialogTitle(tr("Select Keystore File"));
-    m_ui->signingDebugWarningIcon->setPixmap(Utils::Icons::WARNING.pixmap());
-    m_ui->signingDebugWarningIcon->hide();
-    m_ui->signingDebugWarningLabel->hide();
-    signPackageCheckBoxToggled(m_step->signPackage());
 
-    m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput());
-    m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation());
-    m_ui->addDebuggerCheckBox->setChecked(m_step->addDebugger());
+    auto group = new QGroupBox(tr("Application"), this);
+
+    auto targetSDKComboBox = new QComboBox(group);
+    targetSDKComboBox->addItems(targets);
+    targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::buildTargetSDK(step()->target())));
 
-    // target sdk
     const auto cbActivated = QOverload<int>::of(&QComboBox::activated);
-    const auto cbCurrentIndexChanged = QOverload<int>::of(&QComboBox::currentIndexChanged);
-    connect(m_ui->targetSDKComboBox, cbActivated, this, [this](int idx) {
-        const QString sdk = m_ui->targetSDKComboBox->itemText(idx);
-        m_step->setBuildTargetSdk(sdk);
+    connect(targetSDKComboBox, cbActivated, this, [this, targetSDKComboBox](int idx) {
+       const QString sdk = targetSDKComboBox->itemText(idx);
+       m_step->setBuildTargetSdk(sdk);
+   });
+
+    auto hbox = new QHBoxLayout(group);
+    hbox->addWidget(new QLabel(tr("Android build SDK:"), group));
+    hbox->addWidget(targetSDKComboBox);
+
+    return group;
+}
+
+QWidget *AndroidBuildApkWidget::createSignPackageGroup()
+{
+    QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+
+    auto group = new QGroupBox(tr("Sign package"), this);
+
+    auto keystoreLocationLabel = new QLabel(tr("Keystore:"), group);
+    keystoreLocationLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+    auto keystoreLocationChooser = new PathChooser(group);
+    keystoreLocationChooser->setExpectedKind(PathChooser::File);
+    keystoreLocationChooser->lineEdit()->setReadOnly(true);
+    keystoreLocationChooser->setPath(m_step->keystorePath().toUserOutput());
+    keystoreLocationChooser->setInitialBrowsePathBackup(QDir::homePath());
+    keystoreLocationChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)"));
+    keystoreLocationChooser->setPromptDialogTitle(tr("Select Keystore File"));
+    connect(keystoreLocationChooser, &PathChooser::pathChanged, this, [this](const QString &path) {
+        FileName file = FileName::fromString(path);
+        m_step->setKeystorePath(file);
+        m_signPackageCheckBox->setChecked(!file.isEmpty());
+        if (!file.isEmpty())
+            setCertificates();
     });
 
-    // deployment options
-    connect(m_ui->ministroOption, &QAbstractButton::clicked,
-            m_step, &AndroidBuildApkStep::setUseMinistro);
+    auto keystoreCreateButton = new QPushButton(tr("Create..."), group);
+    connect(keystoreCreateButton, &QAbstractButton::clicked, this, [this, keystoreLocationChooser] {
+        AndroidCreateKeystoreCertificate d;
+        if (d.exec() != QDialog::Accepted)
+            return;
+        keystoreLocationChooser->setPath(d.keystoreFilePath().toUserOutput());
+        m_step->setKeystorePath(d.keystoreFilePath());
+        m_step->setKeystorePassword(d.keystorePassword());
+        m_step->setCertificateAlias(d.certificateAlias());
+        m_step->setCertificatePassword(d.certificatePassword());
+        setCertificates();
+    });
 
-    connect(m_ui->openPackageLocationCheckBox, &QAbstractButton::toggled,
-            this, &AndroidBuildApkInnerWidget::openPackageLocationCheckBoxToggled);
-    connect(m_ui->verboseOutputCheckBox, &QAbstractButton::toggled,
-            this, &AndroidBuildApkInnerWidget::verboseOutputCheckBoxToggled);
-    connect(m_ui->addDebuggerCheckBox, &QAbstractButton::toggled,
-            m_step, &AndroidBuildApkStep::setAddDebugger);
+    m_signPackageCheckBox = new QCheckBox(tr("Sign package"), group);
+    m_signPackageCheckBox->setChecked(m_step->signPackage());
 
-    //signing
-    connect(m_ui->signPackageCheckBox, &QAbstractButton::toggled,
-            this, &AndroidBuildApkInnerWidget::signPackageCheckBoxToggled);
-    connect(m_ui->KeystoreCreatePushButton, &QAbstractButton::clicked,
-            this, &AndroidBuildApkInnerWidget::createKeyStore);
-    connect(m_ui->KeystoreLocationPathChooser, &Utils::PathChooser::pathChanged,
-            this, &AndroidBuildApkInnerWidget::updateKeyStorePath);
+    m_signingDebugWarningIcon = new QLabel(group);
+    m_signingDebugWarningIcon->setSizePolicy(sizePolicy);
+    m_signingDebugWarningIcon->setPixmap(Icons::WARNING.pixmap());
+    m_signingDebugWarningIcon->hide();
 
-    auto updateAlias = [this](int idx) {
-        QString alias = m_ui->certificatesAliasComboBox->itemText(idx);
-        if (alias.length())
-            m_step->setCertificateAlias(alias);
-    };
+    m_signingDebugWarningLabel = new QLabel(tr("Signing a debug package"), group);
+    m_signingDebugWarningLabel->setSizePolicy(sizePolicy);
+    m_signingDebugWarningLabel->hide();
 
-    connect(m_ui->certificatesAliasComboBox, cbActivated, this, updateAlias);
-    connect(m_ui->certificatesAliasComboBox, cbCurrentIndexChanged, this, updateAlias);
+    auto certificateAliasLabel = new QLabel(tr("Certificate alias:"), group);
+    certificateAliasLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
-    connect(m_step->buildConfiguration(), &ProjectExplorer::BuildConfiguration::buildTypeChanged,
-            this, &AndroidBuildApkInnerWidget::updateSigningWarning);
+    m_certificatesAliasComboBox = new QComboBox(group);
+    m_certificatesAliasComboBox->setEnabled(false);
+    QSizePolicy sizePolicy2(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    sizePolicy2.setHorizontalStretch(0);
+    sizePolicy2.setVerticalStretch(0);
+    m_certificatesAliasComboBox->setSizePolicy(sizePolicy2);
+    m_certificatesAliasComboBox->setMinimumSize(QSize(300, 0));
 
-    updateSigningWarning();
-}
+    auto horizontalLayout_2 = new QHBoxLayout;
+    horizontalLayout_2->addWidget(keystoreLocationLabel);
+    horizontalLayout_2->addWidget(keystoreLocationChooser);
+    horizontalLayout_2->addWidget(keystoreCreateButton);
 
-AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
-{
-    delete m_ui;
-}
+    auto horizontalLayout_3 = new QHBoxLayout;
+    horizontalLayout_3->addWidget(m_signingDebugWarningIcon);
+    horizontalLayout_3->addWidget(m_signingDebugWarningLabel);
+    horizontalLayout_3->addWidget(certificateAliasLabel);
+    horizontalLayout_3->addWidget(m_certificatesAliasComboBox);
 
-void AndroidBuildApkInnerWidget::signPackageCheckBoxToggled(bool checked)
-{
-    m_ui->certificatesAliasComboBox->setEnabled(checked);
-    m_step->setSignPackage(checked);
-    m_ui->addDebuggerCheckBox->setChecked(!checked);
-    updateSigningWarning();
-    if (!checked)
-        return;
-    if (!m_step->keystorePath().isEmpty())
-        setCertificates();
-}
+    auto vbox = new QVBoxLayout(group);
+    vbox->addLayout(horizontalLayout_2);
+    vbox->addWidget(m_signPackageCheckBox);
+    vbox->addLayout(horizontalLayout_3);
 
-void AndroidBuildApkInnerWidget::createKeyStore()
-{
-    AndroidCreateKeystoreCertificate d;
-    if (d.exec() != QDialog::Accepted)
-        return;
-    m_ui->KeystoreLocationPathChooser->setPath(d.keystoreFilePath().toUserOutput());
-    m_step->setKeystorePath(d.keystoreFilePath());
-    m_step->setKeystorePassword(d.keystorePassword());
-    m_step->setCertificateAlias(d.certificateAlias());
-    m_step->setCertificatePassword(d.certificatePassword());
-    setCertificates();
-}
+    connect(m_signPackageCheckBox, &QAbstractButton::toggled,
+            this, &AndroidBuildApkWidget::signPackageCheckBoxToggled);
 
-void AndroidBuildApkInnerWidget::setCertificates()
-{
-    QAbstractItemModel *certificates = m_step->keystoreCertificates();
-    if (certificates) {
-        m_ui->signPackageCheckBox->setChecked(certificates);
-        m_ui->certificatesAliasComboBox->setModel(certificates);
-    }
-}
+    auto updateAlias = [this](int idx) {
+        QString alias = m_certificatesAliasComboBox->itemText(idx);
+        if (alias.length())
+            m_step->setCertificateAlias(alias);
+    };
 
-void AndroidBuildApkInnerWidget::updateKeyStorePath(const QString &path)
-{
-    Utils::FileName file = Utils::FileName::fromString(path);
-    m_step->setKeystorePath(file);
-    m_ui->signPackageCheckBox->setChecked(!file.isEmpty());
-    if (!file.isEmpty())
-        setCertificates();
-}
+    const auto cbActivated = QOverload<int>::of(&QComboBox::activated);
+    const auto cbCurrentIndexChanged = QOverload<int>::of(&QComboBox::currentIndexChanged);
 
-void AndroidBuildApkInnerWidget::openPackageLocationCheckBoxToggled(bool checked)
-{
-    m_step->setOpenPackageLocation(checked);
-}
+    connect(m_certificatesAliasComboBox, cbActivated, this, updateAlias);
+    connect(m_certificatesAliasComboBox, cbCurrentIndexChanged, this, updateAlias);
 
-void AndroidBuildApkInnerWidget::verboseOutputCheckBoxToggled(bool checked)
-{
-    m_step->setVerboseOutput(checked);
+    return group;
 }
 
-void AndroidBuildApkInnerWidget::updateSigningWarning()
+QWidget *AndroidBuildApkWidget::createAdvancedGroup()
 {
-    bool nonRelease = m_step->buildConfiguration()->buildType()
-            != ProjectExplorer::BuildConfiguration::Release;
-    if (m_step->signPackage() && nonRelease) {
-        m_ui->signingDebugWarningIcon->setVisible(true);
-        m_ui->signingDebugWarningLabel->setVisible(true);
-    } else {
-        m_ui->signingDebugWarningIcon->setVisible(false);
-        m_ui->signingDebugWarningLabel->setVisible(false);
-    }
-}
+    auto group = new QGroupBox(tr("Advanced Actions"), this);
+
+    auto openPackageLocationCheckBox = new QCheckBox(tr("Open package location after build"), group);
+    openPackageLocationCheckBox->setChecked(m_step->openPackageLocation());
+    connect(openPackageLocationCheckBox, &QAbstractButton::toggled,
+            this, [this](bool checked) { m_step->setOpenPackageLocation(checked); });
+
+    m_addDebuggerCheckBox = new QCheckBox(tr("Add debug server"), group);
+    m_addDebuggerCheckBox->setEnabled(false);
+    m_addDebuggerCheckBox->setToolTip(tr("Packages debug server with "
+           "the APK to enable debugging. For the signed APK this option is unchecked by default."));
+    m_addDebuggerCheckBox->setChecked(m_step->addDebugger());
+    connect(m_addDebuggerCheckBox, &QAbstractButton::toggled,
+            m_step, &AndroidBuildApkStep::setAddDebugger);
 
+    auto verboseOutputCheckBox = new QCheckBox(tr("Verbose output"), group);
+    verboseOutputCheckBox->setChecked(m_step->verboseOutput());
 
-// AndroidBuildApkWidget
+    auto ministroOption = new QCheckBox(tr("Use Ministro service to install Qt"), group);
+    ministroOption->setToolTip(tr("Uses the external Ministro application to download and maintain Qt libraries."));
+    ministroOption->setChecked(m_step->useMinistro());
+    connect(ministroOption, &QAbstractButton::clicked,
+            m_step, &AndroidBuildApkStep::setUseMinistro);
 
-AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
-    BuildStepConfigWidget(step),
-    m_step(step)
-{
-    setDisplayName("<b>" + tr("Build Android APK") + "</b>");
-    setSummaryText("<b>" + tr("Build Android APK") + "</b>");
+    auto vbox = new QVBoxLayout(group);
+    vbox->addWidget(openPackageLocationCheckBox);
+    vbox->addWidget(verboseOutputCheckBox);
+    vbox->addWidget(m_addDebuggerCheckBox);
+    vbox->addWidget(ministroOption);
 
-    m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
+    connect(verboseOutputCheckBox, &QAbstractButton::toggled,
+            this, [this](bool checked) { m_step->setVerboseOutput(checked); });
 
-    auto base = new AndroidBuildApkInnerWidget(step);
-    base->layout()->setContentsMargins(0, 0, 0, 0);
+    return group;
+}
 
+QWidget *AndroidBuildApkWidget::createCreateTemplatesGroup()
+{
     auto createTemplatesGroupBox = new QGroupBox(tr("Android"));
     createTemplatesGroupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     auto createAndroidTemplatesButton = new QPushButton(tr("Create Templates"));
+    connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] {
+        CreateAndroidManifestWizard wizard(m_step->target());
+        wizard.exec();
+    });
 
     auto horizontalLayout = new QHBoxLayout(createTemplatesGroupBox);
     horizontalLayout->addWidget(createAndroidTemplatesButton);
     horizontalLayout->addStretch(1);
 
-    auto additionalLibrariesGroupBox = new QGroupBox(tr("Additional Libraries"));
-    additionalLibrariesGroupBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-
-    m_androidExtraLibsListView = new QListView;
-    m_androidExtraLibsListView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    m_androidExtraLibsListView->setToolTip(tr("List of extra libraries to include in Android package and load on startup."));
-    m_androidExtraLibsListView->setModel(m_extraLibraryListModel);
-
-    auto addAndroidExtraLibButton = new QToolButton;
-    addAndroidExtraLibButton->setText(tr("Add..."));
-    addAndroidExtraLibButton->setToolTip(tr("Select library to include in package."));
-    addAndroidExtraLibButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-    addAndroidExtraLibButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
-
-    m_removeAndroidExtraLibButton = new QToolButton;
-    m_removeAndroidExtraLibButton->setText(tr("Remove"));
-    m_removeAndroidExtraLibButton->setToolTip(tr("Remove currently selected library from list."));
-
-    auto androidExtraLibsButtonLayout = new QVBoxLayout();
-    androidExtraLibsButtonLayout->addWidget(addAndroidExtraLibButton);
-    androidExtraLibsButtonLayout->addWidget(m_removeAndroidExtraLibButton);
-    androidExtraLibsButtonLayout->addStretch(1);
-
-    auto androidExtraLibsLayout = new QHBoxLayout(additionalLibrariesGroupBox);
-    androidExtraLibsLayout->addWidget(m_androidExtraLibsListView);
-    androidExtraLibsLayout->addLayout(androidExtraLibsButtonLayout);
-
-    auto topLayout = new QVBoxLayout(this);
-    topLayout->addWidget(base);
-    topLayout->addWidget(createTemplatesGroupBox);
-    topLayout->addWidget(additionalLibrariesGroupBox);
+    return createTemplatesGroupBox;
+}
 
-    connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] {
-        CreateAndroidManifestWizard wizard(m_step->target());
-        wizard.exec();
+QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup()
+{
+    auto group = new QGroupBox(tr("Additional Libraries"));
+    group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+
+    auto libsModel = new AndroidExtraLibraryListModel(m_step->target(), this);
+    connect(libsModel, &AndroidExtraLibraryListModel::enabledChanged,
+            group, &QWidget::setEnabled);
+
+    auto libsView = new QListView;
+    libsView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    libsView->setToolTip(tr("List of extra libraries to include in Android package and load on startup."));
+    libsView->setModel(libsModel);
+
+    auto addLibButton = new QToolButton;
+    addLibButton->setText(tr("Add..."));
+    addLibButton->setToolTip(tr("Select library to include in package."));
+    addLibButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+    addLibButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
+    connect(addLibButton, &QAbstractButton::clicked, this, [this, libsModel] {
+        QStringList fileNames = QFileDialog::getOpenFileNames(this,
+                                                              tr("Select additional libraries"),
+                                                              QDir::homePath(),
+                                                              tr("Libraries (*.so)"));
+        if (!fileNames.isEmpty())
+            libsModel->addEntries(fileNames);
     });
 
-    connect(addAndroidExtraLibButton, &QAbstractButton::clicked,
-            this, &AndroidBuildApkWidget::addAndroidExtraLib);
+    auto removeLibButton = new QToolButton;
+    removeLibButton->setText(tr("Remove"));
+    removeLibButton->setToolTip(tr("Remove currently selected library from list."));
+    connect(removeLibButton, &QAbstractButton::clicked, this, [libsModel, libsView] {
+        QModelIndexList removeList = libsView->selectionModel()->selectedIndexes();
+        libsModel->removeEntries(removeList);
+    });
 
-    connect(m_removeAndroidExtraLibButton, &QAbstractButton::clicked,
-            this, &AndroidBuildApkWidget::removeAndroidExtraLib);
+    auto libsButtonLayout = new QVBoxLayout;
+    libsButtonLayout->addWidget(addLibButton);
+    libsButtonLayout->addWidget(removeLibButton);
+    libsButtonLayout->addStretch(1);
 
-    connect(m_androidExtraLibsListView->selectionModel(), &QItemSelectionModel::selectionChanged,
-            this, &AndroidBuildApkWidget::checkEnableRemoveButton);
+    auto hbox = new QHBoxLayout(group);
+    hbox->addWidget(libsView);
+    hbox->addLayout(libsButtonLayout);
 
-    connect(m_extraLibraryListModel, &AndroidExtraLibraryListModel::enabledChanged,
-            additionalLibrariesGroupBox, &QWidget::setEnabled);
+    QItemSelectionModel *libSelection = libsView->selectionModel();
+    connect(libSelection, &QItemSelectionModel::selectionChanged, this, [libSelection, removeLibButton] {
+        removeLibButton->setEnabled(libSelection->hasSelection());
+    });
 
     Target *target = m_step->target();
     RunConfiguration *rc = target->activeRunConfiguration();
     const ProjectNode *node = rc ? target->project()->findNodeForBuildKey(rc->buildKey()) : nullptr;
-    additionalLibrariesGroupBox->setEnabled(node && !node->parseInProgress());
+    group->setEnabled(node && !node->parseInProgress());
+
+    return group;
 }
 
-void AndroidBuildApkWidget::addAndroidExtraLib()
+void AndroidBuildApkWidget::signPackageCheckBoxToggled(bool checked)
 {
-    QStringList fileNames = QFileDialog::getOpenFileNames(this,
-                                                          tr("Select additional libraries"),
-                                                          QDir::homePath(),
-                                                          tr("Libraries (*.so)"));
-
-    if (!fileNames.isEmpty())
-        m_extraLibraryListModel->addEntries(fileNames);
+    m_certificatesAliasComboBox->setEnabled(checked);
+    m_step->setSignPackage(checked);
+    m_addDebuggerCheckBox->setChecked(!checked);
+    updateSigningWarning();
+    if (!checked)
+        return;
+    if (!m_step->keystorePath().isEmpty())
+        setCertificates();
 }
 
-void AndroidBuildApkWidget::removeAndroidExtraLib()
+void AndroidBuildApkWidget::setCertificates()
 {
-    QModelIndexList removeList = m_androidExtraLibsListView->selectionModel()->selectedIndexes();
-    m_extraLibraryListModel->removeEntries(removeList);
+    QAbstractItemModel *certificates = m_step->keystoreCertificates();
+    if (certificates) {
+        m_signPackageCheckBox->setChecked(certificates);
+        m_certificatesAliasComboBox->setModel(certificates);
+    }
 }
 
-void AndroidBuildApkWidget::checkEnableRemoveButton()
+void AndroidBuildApkWidget::updateSigningWarning()
 {
-    m_removeAndroidExtraLibButton->setEnabled(m_androidExtraLibsListView->selectionModel()->hasSelection());
+    bool nonRelease = m_step->buildConfiguration()->buildType() != BuildConfiguration::Release;
+    bool visible = m_step->signPackage() && nonRelease;
+    m_signingDebugWarningIcon->setVisible(visible);
+    m_signingDebugWarningLabel->setVisible(visible);
 }
 
 } // Internal
diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h
index 0a51ba59853..4c35b5dcd7c 100644
--- a/src/plugins/android/androidbuildapkwidget.h
+++ b/src/plugins/android/androidbuildapkwidget.h
@@ -29,64 +29,43 @@
 #include "android_global.h"
 
 #include "androidbuildapkstep.h"
-#include "androidextralibrarylistmodel.h"
 
 #include <projectexplorer/buildstep.h>
 
-#include <QListView>
-#include <QToolButton>
-
 QT_BEGIN_NAMESPACE
-namespace Ui { class AndroidBuildApkWidget; }
+class QCheckBox;
+class QComboBox;
+class QLabel;
 QT_END_NAMESPACE
 
 namespace Android {
 namespace Internal {
 
-class AndroidBuildApkInnerWidget : public ProjectExplorer::BuildStepConfigWidget
+class AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 
 public:
-    AndroidBuildApkInnerWidget(AndroidBuildApkStep *step);
-    ~AndroidBuildApkInnerWidget() override;
+    explicit AndroidBuildApkWidget(AndroidBuildApkStep *step);
 
 private:
-    void createKeyStore();
+    void setCertificates();
     void updateSigningWarning();
-    void openPackageLocationCheckBoxToggled(bool checked);
-    void verboseOutputCheckBoxToggled(bool checked);
-    void updateKeyStorePath(const QString &path);
     void signPackageCheckBoxToggled(bool checked);
 
-    void setCertificates();
-
-    Ui::AndroidBuildApkWidget *m_ui;
-    AndroidBuildApkStep *m_step;
-};
-
-class AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget
-{
-    Q_OBJECT
-
-public:
-    explicit AndroidBuildApkWidget(AndroidBuildApkStep *step);
-
-signals:
-    void requestAndroidTemplates();
-
-private:
-    void addAndroidExtraLib();
-    void removeAndroidExtraLib();
-    void checkEnableRemoveButton();
+    QWidget *createApplicationGroup();
+    QWidget *createSignPackageGroup();
+    QWidget *createAdvancedGroup();
+    QWidget *createCreateTemplatesGroup();
+    QWidget *createAdditionalLibrariesGroup();
 
 private:
-    QListView *m_androidExtraLibsListView = nullptr;
-    QToolButton *m_removeAndroidExtraLibButton = nullptr;
-
     AndroidBuildApkStep *m_step = nullptr;
-    Android::AndroidExtraLibraryListModel *m_extraLibraryListModel = nullptr;
-    bool m_ignoreChange = false;
+    QCheckBox *m_signPackageCheckBox = nullptr;
+    QLabel *m_signingDebugWarningIcon = nullptr;
+    QLabel *m_signingDebugWarningLabel = nullptr;
+    QComboBox *m_certificatesAliasComboBox = nullptr;
+    QCheckBox *m_addDebuggerCheckBox = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/android/androidbuildapkwidget.ui b/src/plugins/android/androidbuildapkwidget.ui
deleted file mode 100644
index 98c53b64b7f..00000000000
--- a/src/plugins/android/androidbuildapkwidget.ui
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AndroidBuildApkWidget</class>
- <widget class="QWidget" name="AndroidBuildApkWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>641</width>
-    <height>349</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="1" column="0" colspan="2">
-    <widget class="QGroupBox" name="signPackage">
-     <property name="title">
-      <string>Sign package</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="KeystoreLocationLabel">
-          <property name="text">
-           <string>Keystore:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="Utils::PathChooser" name="KeystoreLocationPathChooser" native="true"/>
-        </item>
-        <item>
-         <widget class="QPushButton" name="KeystoreCreatePushButton">
-          <property name="text">
-           <string>Create...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="QCheckBox" name="signPackageCheckBox">
-          <property name="text">
-           <string>Sign package</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QLabel" name="signingDebugWarningIcon">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="signingDebugWarningLabel">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Signing a debug package</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="KeystoreLocationLabel_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Certificate alias:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="certificatesAliasComboBox">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>300</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QGroupBox" name="application">
-     <property name="title">
-      <string>Application</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <widget class="QLabel" name="targetSDKLabel">
-        <property name="text">
-         <string>Android build SDK:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="targetSDKComboBox"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="advancedActions">
-     <property name="title">
-      <string>Advanced Actions</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="2">
-       <widget class="QCheckBox" name="openPackageLocationCheckBox">
-        <property name="text">
-         <string>Open package location after build</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="addDebuggerCheckBox">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="toolTip">
-         <string>Packages debug server with the APK to enable debugging. For the signed APK this option is unchecked by default.</string>
-        </property>
-        <property name="text">
-         <string>Add debug server</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QCheckBox" name="verboseOutputCheckBox">
-        <property name="text">
-         <string>Verbose output</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="ministroOption">
-        <property name="toolTip">
-         <string>Uses the external Ministro application to download and maintain Qt libraries.</string>
-        </property>
-        <property name="text">
-         <string>Use Ministro service to install Qt</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Utils::PathChooser</class>
-   <extends>QWidget</extends>
-   <header location="global">utils/pathchooser.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>signPackageCheckBox</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>addDebuggerCheckBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>113</x>
-     <y>178</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>510</x>
-     <y>452</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>