summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidconfigurations.h
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@theqtcompany.com>2015-01-08 17:05:09 +0100
committerDaniel Teske <daniel.teske@theqtcompany.com>2015-01-13 11:11:52 +0100
commitab372deb1fb7365eb9fb5d01b13bd3d2ea56706e (patch)
tree01d96ddf6c382b75f9058f8b68e2535836f477ef /src/plugins/android/androidconfigurations.h
parent8a29109fe9cc4838185d17d94f5ee178c4b2abc1 (diff)
downloadqt-creator-ab372deb1fb7365eb9fb5d01b13bd3d2ea56706e.tar.gz
Android: Reduce time to open settings widget
Two major areas of improvement: - Make connections last, so that the initial setup does not trigger any unnecessary checks. - Make fetching the list of android virtual devices a background operation. Together they reduce the time needed to open the settings for me by roughly 10 times. Task-number: QTCREATORBUG-13735 Change-Id: I0839853dcdbdfe20a183a27888e55d3c56a9b815 Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidconfigurations.h')
-rw-r--r--src/plugins/android/androidconfigurations.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index ba39917a27..105866de91 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -146,7 +146,10 @@ public:
bool removeAVD(const QString &name) const;
QVector<AndroidDeviceInfo> connectedDevices(QString *error = 0) const;
+
+ QFuture<QVector<AndroidDeviceInfo> > androidVirtualDevicesFuture();
QVector<AndroidDeviceInfo> androidVirtualDevices() const;
+
QString startAVD(const QString &name, int apiLevel, QString cpuAbi) const;
bool startAVDAsync(const QString &avdName) const;
QString findAvd(int apiLevel, const QString &cpuAbi) const;
@@ -165,6 +168,7 @@ public:
SdkPlatform highestAndroidSdk() const;
private:
static CreateAvdInfo createAVDImpl(CreateAvdInfo info, Utils::FileName androidToolPath, Utils::Environment env);
+ static QVector<AndroidDeviceInfo> androidVirtualDevicesImpl(const Utils::FileName &androidTool, const Utils::Environment &environment);
Utils::FileName toolPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const;
Utils::FileName openJDKBinPath() const;