From 8009962584a4bc4d069d99cb9e65e8a0d7cf5fc8 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Thu, 2 Apr 2020 10:46:12 +0300
Subject: [PATCH] Android: remove automatic sdk setup ambiguity

Use label text instead of icon for Auto SDK download button.

Fixes: QTCREATORBUG-23774
Change-Id: I5f10bafb0cdf88210f7121504778885291169e07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/android/androidsettingswidget.cpp |   1 -
 src/plugins/android/androidsettingswidget.ui  | 109 +++++++++---------
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 28b3ad3c5f4..8835df58ec1 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -506,7 +506,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
     m_ui->downloadNDKToolButton->setIcon(downloadIcon);
     m_ui->downloadOpenJDKToolButton->setIcon(downloadIcon);
     m_ui->downloadOpenSSLPrebuiltLibs->setIcon(downloadIcon);
-    m_ui->sdkToolsAutoDownloadButton->setIcon(Utils::Icons::RELOAD.icon());
     m_ui->sdkToolsAutoDownloadButton->setToolTip(tr(
             "Automatically download Android SDK Tools to selected location.\n\n"
             "If the selected path contains no valid SDK Tools, the SDK Tools package "
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui
index 56eba59b99d..94e6da4f7c5 100644
--- a/src/plugins/android/androidsettingswidget.ui
+++ b/src/plugins/android/androidsettingswidget.ui
@@ -129,62 +129,6 @@
           <string>Android Settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QLabel" name="SDKLocationLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Android SDK location:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="5">
-           <widget class="QToolButton" name="sdkToolsAutoDownloadButton">
-            <property name="toolTip">
-             <string>Automatically download Android SDK Tools to selected location.</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="6">
-           <widget class="QToolButton" name="downloadSDKToolButton">
-            <property name="toolTip">
-             <string>Open Android SDK download URL in the system's browser.</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="6">
-           <widget class="QToolButton" name="downloadNDKToolButton">
-            <property name="toolTip">
-             <string>Open Android NDK download URL in the system's browser.</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="4">
-           <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/>
-          </item>
-          <item row="5" column="0" colspan="7">
-           <widget class="Utils::DetailsWidget" name="androidDetailsWidget" native="true"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="ndkComboBoxLabel">
-            <property name="text">
-             <string>Android NDK list:</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="1" rowspan="3">
            <widget class="QListWidget" name="ndkListWidget">
             <property name="sizeAdjustPolicy">
@@ -256,6 +200,59 @@
             </item>
            </layout>
           </item>
+          <item row="5" column="0" colspan="7">
+           <widget class="Utils::DetailsWidget" name="androidDetailsWidget" native="true"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="ndkComboBoxLabel">
+            <property name="text">
+             <string>Android NDK list:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="6">
+           <widget class="QToolButton" name="downloadSDKToolButton">
+            <property name="toolTip">
+             <string>Open Android SDK download URL in the system's browser.</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="SDKLocationLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Android SDK location:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="6">
+           <widget class="QToolButton" name="downloadNDKToolButton">
+            <property name="toolTip">
+             <string>Open Android NDK download URL in the system's browser.</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="Utils::PathChooser" name="SDKLocationPathChooser" native="true"/>
+          </item>
+          <item row="0" column="2" colspan="3">
+           <widget class="QPushButton" name="sdkToolsAutoDownloadButton">
+            <property name="text">
+             <string>Set Up SDK</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>