Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	src/tools/qml2puppet/CMakeLists.txt

Change-Id: Id6243b0f725a68075d789bf35e771113b742645b

1 files changed, 10 insertions, 1 deletions

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index d7c136fd7b1..28b3ad3c5f4 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -428,6 +428,9 @@ AndroidSettingsWidget::AndroidSettingsWidget()
         m_ui->SDKLocationPathChooser->setEnabled(true);
         m_ui->managerTabWidget->tabBar()->setEnabled(true);
     });
+    connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::licenseWorkflowStarted, [this]() {
+       m_ui->scrollArea->ensureWidgetVisible(m_ui->managerTabWidget);
+    });
 
     QMap<int, QString> javaValidationPoints;
     javaValidationPoints[JavaPathExistsRow] = tr("JDK path exists.");
@@ -1020,7 +1023,13 @@ AndroidSettingsPage::AndroidSettingsPage()
     setId(Constants::ANDROID_SETTINGS_ID);
     setDisplayName(AndroidSettingsWidget::tr("Android"));
     setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
-    setWidgetCreator([] { return new AndroidSettingsWidget; });
+    setWidgetCreator([] {
+        auto widget = new AndroidSettingsWidget;
+        QPalette pal = widget->palette();
+        pal.setColor(QPalette::Window, Utils::creatorTheme()->color(Utils::Theme::BackgroundColorNormal));
+        widget->setPalette(pal);
+        return widget;
+    });
 }
 
 } // namespace Internal