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

Android: Inline AndroidManager::intentName into only user

Browse Source 
Using Target is actually not optimal as handle to access that
information (BuildSystem + BuildKey or sth to that effect would
be better), so reduce the visibility of this kind of interface.

Change-Id: I138f156b51795d51d2af49c5119d160663dfc20d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-02-24 11:55:29 +01:00
parent 564c0c1b94
commit 5c9141241b
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidmanager.cpp
View File

@@ -205,11 +205,6 @@ void AndroidManager::apkInfo(const Utils::FilePath &apkPath,
} }
} }
QString AndroidManager::intentName(ProjectExplorer::Target *target)
{
return packageName(target) + QLatin1Char('/') + activityName(target);
}
QString AndroidManager::activityName(ProjectExplorer::Target *target) QString AndroidManager::activityName(ProjectExplorer::Target *target)
{ {
QDomDocument doc; QDomDocument doc;

1
src/plugins/android/androidmanager.h
View File

@@ -78,7 +78,6 @@ public:
QString *packageName = nullptr, QString *packageName = nullptr,
int *version = nullptr, int *version = nullptr,
QString *activityPath = nullptr); QString *activityPath = nullptr);
static QString intentName(ProjectExplorer::Target *target);
static QString activityName(ProjectExplorer::Target *target); static QString activityName(ProjectExplorer::Target *target);
static QString deviceSerialNumber(ProjectExplorer::Target *target); static QString deviceSerialNumber(ProjectExplorer::Target *target);

5
src/plugins/android/androidrunner.cpp
View File

@@ -132,7 +132,10 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
m_checkAVDTimer.setInterval(2000); m_checkAVDTimer.setInterval(2000);
connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD); connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD);
QString intent = intentName.isEmpty() ? AndroidManager::intentName(m_target) : intentName; QString intent = intentName;
if (intent.isEmpty())
intent = AndroidManager::packageName(m_target) + '/' + AndroidManager::activityName(m_target);
m_packageName = intent.left(intent.indexOf('/')); m_packageName = intent.left(intent.indexOf('/'));
qCDebug(androidRunnerLog) << "Intent name:" << intent << "Package name" << m_packageName; qCDebug(androidRunnerLog) << "Intent name:" << intent << "Package name" << m_packageName;