feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Rework Create AVD dialog

Browse Source 
Filter the list of api levels to only show those that can be created.

Change-Id: I7aaaa58324ca44176e39982cda29d746011fa346
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2014-03-24 16:31:28 +01:00
parent 7e4502d676
commit a087b3cd7f
10 changed files with 307 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androidconfigurations.h
View File

@@ -65,6 +65,17 @@ struct AndroidDeviceInfo
static QStringList adbSelector(const QString &serialNumber);
};
class SdkPlatform
{
public:
SdkPlatform()
: apiLevel(-1)
{}
int apiLevel;
QString name;
QStringList abis;
};
class AndroidConfig
{
public:
@@ -73,7 +84,8 @@ public:
void load(const QSettings &settings);
void save(QSettings &settings) const;
QStringList sdkTargets(int minApiLevel = 0) const;
static QStringList apiLevelNamesFor(const QList<SdkPlatform> &platforms);
QList<SdkPlatform> sdkTargets(int minApiLevel = 0) const;
Utils::FileName sdkLocation() const;
void setSdkLocation(const Utils::FileName &sdkLocation);
@@ -137,8 +149,7 @@ public:
bool waitForBooted(const QString &serialNumber, const QFutureInterface<bool> &fi) const;
bool isConnected(const QString &serialNumber) const;
QString highestAndroidSdk() const;
SdkPlatform highestAndroidSdk() const;
private:
Utils::FileName toolPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const;
Utils::FileName openJDKBinPath() const;
@@ -160,7 +171,8 @@ private:
//caches
mutable bool m_availableSdkPlatformsUpToDate;
mutable QVector<int> m_availableSdkPlatforms;
mutable QVector<SdkPlatform> m_availableSdkPlatforms;
static bool sortSdkPlatformByApiLevel(const SdkPlatform &a, const SdkPlatform &b);
mutable bool m_NdkInformationUpToDate;
mutable QString m_toolchainHost;