Android: remove native sdk and avd manager buttons

The native SDK and AVD manager buttons are no longer useful, since the
original, visual Java-basd tool for managing SDK and AVDs were removed
from Google's offering. The replacement is a set of command line tools
and a visual tool within Android Studio, which can not directly be
launched from Qt Creator.

Qt Creator has it's UI on top of the command line tools.

Change-Id: If660d7f566c173f46d9b2a97c9204746d33270e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

1 files changed, 1 insertions, 18 deletions

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index fdc3e1385e8..ff1766411b1 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -118,7 +118,6 @@ private:
     void startAVD();
     void avdActivated(const QModelIndex &);
     void dataPartitionSizeEditingFinished();
-    void manageAVD();
     void createKitToggled();
 
     void updateUI();
@@ -506,8 +505,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
             this, &AndroidSettingsWidget::avdActivated);
     connect(m_ui.DataPartitionSizeSpinBox, &QAbstractSpinBox::editingFinished,
             this, &AndroidSettingsWidget::dataPartitionSizeEditingFinished);
-    connect(m_ui.nativeAvdManagerButton, &QAbstractButton::clicked,
-            this, &AndroidSettingsWidget::manageAVD);
     connect(m_ui.CreateKitCheckBox, &QAbstractButton::toggled,
             this, &AndroidSettingsWidget::createKitToggled);
     connect(m_ui.downloadNDKToolButton, &QAbstractButton::clicked,
@@ -735,7 +732,7 @@ void AndroidSettingsWidget::validateSdk()
                                                         PlatformSdkInstalledRow,
                                                         AllEssentialsInstalledRow});
     m_androidConfig.setSdkFullyConfigured(sdkToolsOk && componentsOk);
-    if (sdkToolsOk && !componentsOk && !m_androidConfig.useNativeUiTools()) {
+    if (sdkToolsOk && !componentsOk) {
         // Ask user to install essential SDK components. Works only for sdk tools version >= 26.0.0
         QString message = tr("Android SDK installation is missing necessary packages. Do you "
                              "want to install the missing packages?");
@@ -920,7 +917,6 @@ void AndroidSettingsWidget::updateUI()
 
     m_ui.avdManagerTab->setEnabled(javaSetupOk && androidSetupOk);
     m_ui.sdkManagerTab->setEnabled(sdkToolsOk);
-    m_sdkManagerWidget->setSdkManagerControlsEnabled(!m_androidConfig.useNativeUiTools());
 
     const QListWidgetItem *currentItem = m_ui.ndkListWidget->currentItem();
     const FilePath currentNdk = FilePath::fromString(currentItem ? currentItem->text() : "");
@@ -934,19 +930,6 @@ void AndroidSettingsWidget::updateUI()
     m_openSslSummary->setSetupOk(openSslOk);
 }
 
-void AndroidSettingsWidget::manageAVD()
-{
-    if (m_androidConfig.useNativeUiTools()) {
-        m_avdManager.launchAvdManagerUiTool();
-    } else {
-        QMessageBox::warning(this, tr("AVD Manager Not Available"),
-                             tr("AVD manager UI tool is not available in the installed SDK tools "
-                                "(version %1). Use the command line tool \"avdmanager\" for "
-                                "advanced AVD management.")
-                             .arg(m_androidConfig.sdkToolsVersion().toString()));
-    }
-}
-
 void AndroidSettingsWidget::downloadSdk()
 {
     if (sdkToolsOk()) {