1 files changed, 9 insertions, 21 deletions

diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index cb489716a9..bc39aaef10 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -76,7 +76,6 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config,
     m_ui->setupUi(this);
     m_ui->sdkLicensebuttonBox->hide();
     m_ui->sdkLicenseLabel->hide();
-    m_ui->warningLabel->setType(Utils::InfoLabel::Warning);
     m_ui->viewStack->setCurrentWidget(m_ui->packagesStack);
 
     m_formatter = new Utils::OutputFormatter;
@@ -133,8 +132,6 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config,
             this, &AndroidSdkManagerWidget::onApplyButton);
     connect(m_ui->cancelButton, &QPushButton::clicked, this,
             &AndroidSdkManagerWidget::onCancel);
-    connect(m_ui->nativeSdkManagerButton, &QPushButton::clicked,
-            this, &AndroidSdkManagerWidget::onNativeSdkManager);
     connect(m_ui->optionsButton, &QPushButton::clicked,
             this, &AndroidSdkManagerWidget::onSdkManagerOptions);
     connect(m_ui->sdkLicensebuttonBox, &QDialogButtonBox::accepted, [this]() {
@@ -160,7 +157,6 @@ void AndroidSdkManagerWidget::setSdkManagerControlsEnabled(bool enable)
 {
     m_ui->packagesTypeGroup->setEnabled(enable);
     m_ui->expandCheck->setVisible(enable);
-    m_ui->warningLabel->setVisible(!enable);
     m_ui->packagesView->setEnabled(enable);
     m_ui->updateInstalledButton->setEnabled(enable);
     m_ui->optionsButton->setEnabled(enable);
@@ -169,7 +165,14 @@ void AndroidSdkManagerWidget::setSdkManagerControlsEnabled(bool enable)
 void AndroidSdkManagerWidget::installEssentials()
 {
     m_sdkModel->selectMissingEssentials();
-    m_ui->applySelectionButton->click();
+    if (!m_sdkModel->missingEssentials().isEmpty()) {
+        QMessageBox::warning(this,
+                             tr("Android SDK Changes"),
+                             tr("Qt Creator couldn't find the following essential packages: \"%1\".\n"
+                                "Install them manually after the current operation is done.\n")
+                                 .arg(m_sdkModel->missingEssentials().join("\", \"")));
+    }
+    onApplyButton();
 }
 
 void AndroidSdkManagerWidget::beginLicenseCheck()
@@ -246,19 +249,6 @@ void AndroidSdkManagerWidget::onCancel()
     cancelPendingOperations();
 }
 
-void AndroidSdkManagerWidget::onNativeSdkManager()
-{
-    if (m_androidConfig.useNativeUiTools()) {
-        QProcess::startDetached(m_androidConfig.androidToolPath().toString(), {});
-    } else {
-        QMessageBox::warning(this, tr("Native SDK Manager Not Available"),
-                             tr("SDK manager UI tool is not available in the installed SDK tools "
-                                "(version %1). Use the command line tool \"sdkmanager\" for "
-                                "advanced SDK management.")
-                             .arg(m_androidConfig.sdkToolsVersion().toString()));
-    }
-}
-
 void AndroidSdkManagerWidget::onOperationResult(int index)
 {
     QTC_ASSERT(m_currentOperation, return);
@@ -436,10 +426,8 @@ void AndroidSdkManagerWidget::cancelPendingOperations()
 
 void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
 {
-    if (m_currentView == PackageListing) {
+    if (m_currentView == PackageListing)
         m_formatter->clear();
-        m_ui->outputEdit->clear();
-    }
     m_currentView = view;
     if (m_currentView == PackageListing)
         emit updatingSdkFinished();