Android: Move CreateAndroidManifestWizard and related build step to base

It does not directly depend on qmake anymore.

Change-Id: I3b9625e54d98c79ef137059cf4554b3f2807e88e
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>

src/plugins/android/android.pro

@@ -54,7 +54,8 @@ HEADERS += \
     androidsdkmodel.h \
     androidsdkmanagerwidget.h \
     androidpackageinstallationstep.h \
-    androidextralibrarylistmodel.h
+    androidextralibrarylistmodel.h \
+    createandroidmanifestwizard.h
 
 SOURCES += \
     androidconfigurations.cpp \
@@ -102,7 +103,8 @@ SOURCES += \
     androidsdkmodel.cpp \
     androidsdkmanagerwidget.cpp \
     androidpackageinstallationstep.cpp \
-    androidextralibrarylistmodel.cpp
+    androidextralibrarylistmodel.cpp \
+    createandroidmanifestwizard.cpp
 
 FORMS += \
     androidsettingswidget.ui \

src/plugins/android/android.qbs

@@ -116,6 +116,8 @@ Project {
             "avddialog.h",
             "certificatesmodel.cpp",
             "certificatesmodel.h",
+            "createandroidmanifestwizard.h",
+            "createandroidmanifestwizard.cpp",
             "javaeditor.cpp",
             "javaeditor.h",
             "javaindenter.cpp",

src/plugins/android/androidbuildapkstep.cpp

@@ -25,6 +25,7 @@
 ****************************************************************************/
 
 #include "androidbuildapkstep.h"
+
 #include "androidbuildapkwidget.h"
 #include "androidconfigurations.h"
 #include "androidconstants.h"
@@ -40,6 +41,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
 #include <qtsupport/qtkitinformation.h>
@@ -48,6 +50,8 @@
 #include <utils/synchronousprocess.h>
 #include <utils/utilsicons.h>
 
+#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
+
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QLabel>
@@ -61,12 +65,15 @@
 #include <memory>
 
 using namespace ProjectExplorer;
+using namespace Android::Internal;
+
 namespace {
 Q_LOGGING_CATEGORY(buildapkstepLog, "qtc.android.build.androidbuildapkstep")
 }
 
 namespace Android {
-using namespace Internal;
+
+const Core::Id ANDROID_BUILD_APK_ID("QmakeProjectManager.AndroidBuildApkStep");
 
 const QVersionNumber gradleScriptRevokedSdkVersion(25, 3, 0);
 const char KeystoreLocationKey[] = "KeystoreLocation";
@@ -115,8 +122,8 @@ private:
                                                        this);
 };
 
-AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, Core::Id id)
-    : ProjectExplorer::AbstractProcessStep(parent, id),
+AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
+    : AbstractProcessStep(parent, ANDROID_BUILD_APK_ID),
       m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
                                          sdkManager()->latestAndroidSdkPlatform()))
 {
@@ -263,7 +270,7 @@ void AndroidBuildApkStep::showInGraphicalShell()
 
 ProjectExplorer::BuildStepConfigWidget *AndroidBuildApkStep::createConfigWidget()
 {
-    return new AndroidBuildApkInnerWidget(this);
+    return new AndroidBuildApkWidget(this);
 }
 
 void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus status)
@@ -537,6 +544,22 @@ QString PasswordInputDialog::getPassword(Context context, std::function<bool (co
     return isAccepted ? dlg->inputEdit->text() : "";
 }
 
+
+namespace Internal {
+
+// AndroidBuildApkStepFactory
+
+AndroidBuildApkStepFactory::AndroidBuildApkStepFactory()
+{
+    registerStep<AndroidBuildApkStep>(ANDROID_BUILD_APK_ID);
+    setSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID);
+    setSupportedDeviceType(Constants::ANDROID_DEVICE_TYPE);
+    setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+    setDisplayName(AndroidBuildApkStep::tr("Build Android APK"));
+    setRepeatable(false);
+}
+
+} // namespace Internal
 } // namespace Android
 
 #include "androidbuildapkstep.moc"

src/plugins/android/androidbuildapkstep.h

@@ -27,6 +27,7 @@
 #pragma once
 
 #include "android_global.h"
+
 #include <projectexplorer/abstractprocessstep.h>
 
 QT_BEGIN_NAMESPACE
@@ -39,10 +40,9 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
 {
     Q_OBJECT
 
-protected:
-    AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
-
 public:
+    AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc);
+
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
 
@@ -104,4 +104,13 @@ private:
     bool m_skipBuilding = false;
 };
 
+namespace Internal {
+
+class AndroidBuildApkStepFactory : public ProjectExplorer::BuildStepFactory
+{
+public:
+    AndroidBuildApkStepFactory();
+};
+
+} // namespace Internal
 } // namespace Android

src/plugins/android/androidbuildapkwidget.cpp

@@ -30,11 +30,9 @@
 #include "androidcreatekeystorecertificate.h"
 #include "androidmanager.h"
 #include "androidsdkmanager.h"
+#include "createandroidmanifestwizard.h"
 #include "ui_androidbuildapkwidget.h"
 
-#include <android/androidbuildapkwidget.h>
-#include <android/androidmanager.h>
-
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
@@ -55,10 +53,8 @@
 
 #include <algorithm>
 
-using namespace Android;
-using namespace Internal;
-
 namespace Android {
+namespace Internal {
 
 const int minApiSupported = 9;
 
@@ -240,7 +236,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
 {
     m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
 
-    auto base = new Android::AndroidBuildApkInnerWidget(step);
+    auto base = new AndroidBuildApkInnerWidget(step);
     base->layout()->setContentsMargins(0, 0, 0, 0);
 
     auto createTemplatesGroupBox = new QGroupBox(tr("Android"));
@@ -284,8 +280,10 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
     topLayout->addWidget(createTemplatesGroupBox);
     topLayout->addWidget(additionalLibrariesGroupBox);
 
-    connect(createAndroidTemplatesButton, &QAbstractButton::clicked,
-            this, &AndroidBuildApkWidget::requestAndroidTemplates);
+    connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] {
+        CreateAndroidManifestWizard wizard(m_step->target());
+        wizard.exec();
+    });
 
     connect(addAndroidExtraLibButton, &QAbstractButton::clicked,
             this, &AndroidBuildApkWidget::addAndroidExtraLib);
@@ -336,4 +334,5 @@ QString AndroidBuildApkWidget::displayName() const
     return summaryText();
 }
 
+} // Internal
 } // Android

src/plugins/android/androidbuildapkwidget.h

@@ -42,10 +42,9 @@ namespace Ui { class AndroidBuildApkWidget; }
 QT_END_NAMESPACE
 
 namespace Android {
+namespace Internal {
 
-class AndroidBuildApkStep;
-
-class ANDROID_EXPORT AndroidBuildApkInnerWidget : public ProjectExplorer::BuildStepConfigWidget
+class AndroidBuildApkInnerWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 
@@ -72,12 +71,12 @@ private:
     AndroidBuildApkStep *m_step;
 };
 
-class ANDROID_EXPORT AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget
+class AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 
 public:
-    explicit AndroidBuildApkWidget(Android::AndroidBuildApkStep *step);
+    explicit AndroidBuildApkWidget(AndroidBuildApkStep *step);
 
 signals:
     void requestAndroidTemplates();
@@ -94,9 +93,10 @@ private:
     QListView *m_androidExtraLibsListView = nullptr;
     QToolButton *m_removeAndroidExtraLibButton = nullptr;
 
-    Android::AndroidBuildApkStep *m_step = nullptr;
+    AndroidBuildApkStep *m_step = nullptr;
     Android::AndroidExtraLibraryListModel *m_extraLibraryListModel = nullptr;
     bool m_ignoreChange = false;
 };
 
+} // namespace Internal
 } // namespace Android

src/plugins/android/androidplugin.cpp

@@ -92,6 +92,7 @@ public:
     AndroidPackageInstallationFactory packackeInstallationFactory;
     AndroidManifestEditorFactory manifestEditorFactory;
     AndroidRunConfigurationFactory runConfigFactory;
+    AndroidBuildApkStepFactory buildApkStepFactory;
 };
 
 AndroidPlugin::~AndroidPlugin()

src/plugins/android/androidqtsupport.cpp

@@ -30,6 +30,8 @@
 
 #include <projectexplorer/target.h>
 
+using namespace Android::Internal;
+
 Utils::FileName Android::AndroidQtSupport::apkPath(const ProjectExplorer::Target *target) const
 {
     if (!target)

src/plugins/android/createandroidmanifestwizard.cpp

@@ -0,0 +1,379 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "createandroidmanifestwizard.h"
+
+#include <android/androidconfigurations.h>
+#include <android/androidmanager.h>
+#include <android/androidqtsupport.h>
+
+#include <coreplugin/editormanager/editormanager.h>
+
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/target.h>
+
+#include <qtsupport/qtkitinformation.h>
+
+#include <utils/utilsicons.h>
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDir>
+#include <QFileInfo>
+#include <QFormLayout>
+#include <QLabel>
+#include <QMessageBox>
+#include <QVBoxLayout>
+
+using namespace ProjectExplorer;
+using namespace Utils;
+
+namespace Android {
+
+//
+// NoApplicationProFilePage
+//
+NoApplicationProFilePage::NoApplicationProFilePage(CreateAndroidManifestWizard *wizard)
+    : m_wizard(wizard)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    QLabel *label = new QLabel(this);
+    label->setWordWrap(true);
+    label->setText(tr("No application .pro file found in this project."));
+    layout->addWidget(label);
+    setTitle(tr("No Application .pro File"));
+}
+
+//
+// ChooseProFilePage
+//
+ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard)
+    : m_wizard(wizard)
+{
+    QFormLayout *fl = new QFormLayout(this);
+    QLabel *label = new QLabel(this);
+    label->setWordWrap(true);
+    label->setText(tr("Select the .pro file for which you want to create the Android template files."));
+    fl->addRow(label);
+
+    Target *target = wizard->target();
+    QString currentBuildTarget;
+    if (RunConfiguration *rc = target->activeRunConfiguration())
+        currentBuildTarget = rc->buildKey();
+
+    m_comboBox = new QComboBox(this);
+    const BuildTargetInfoList buildTargets = wizard->target()->applicationTargets();
+    for (const BuildTargetInfo &bti : buildTargets.list) {
+        const QString displayName = bti.buildKey;
+        m_comboBox->addItem(displayName, QVariant(bti.buildKey)); // TODO something more?
+        if (bti.buildKey == currentBuildTarget)
+            m_comboBox->setCurrentIndex(m_comboBox->count() - 1);
+    }
+
+    nodeSelected(m_comboBox->currentIndex());
+    connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &ChooseProFilePage::nodeSelected);
+
+    fl->addRow(tr(".pro file:"), m_comboBox);
+    setTitle(tr("Select a .pro File"));
+}
+
+void ChooseProFilePage::nodeSelected(int index)
+{
+    Q_UNUSED(index)
+    m_wizard->setBuildKey(m_comboBox->itemData(m_comboBox->currentIndex()).toString());
+}
+
+
+//
+// ChooseDirectoryPage
+//
+ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
+    : m_wizard(wizard), m_androidPackageSourceDir(0), m_complete(true)
+{
+    m_layout = new QFormLayout(this);
+    m_label = new QLabel(this);
+    m_label->setWordWrap(true);
+    m_layout->addRow(m_label);
+
+    m_androidPackageSourceDir = new PathChooser(this);
+    m_androidPackageSourceDir->setExpectedKind(PathChooser::Directory);
+    m_layout->addRow(tr("Android package source directory:"), m_androidPackageSourceDir);
+
+    m_sourceDirectoryWarning = new QLabel(this);
+    m_sourceDirectoryWarning->setVisible(false);
+    m_sourceDirectoryWarning->setText(tr("The Android package source directory cannot be the same as the project directory."));
+    m_sourceDirectoryWarning->setWordWrap(true);
+    m_warningIcon = new QLabel(this);
+    m_warningIcon->setVisible(false);
+    m_warningIcon->setPixmap(Utils::Icons::CRITICAL.pixmap());
+    m_warningIcon->setWordWrap(true);
+    m_warningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+    QHBoxLayout *hbox = new QHBoxLayout;
+    hbox->addWidget(m_warningIcon);
+    hbox->addWidget(m_sourceDirectoryWarning);
+    hbox->setAlignment(m_warningIcon, Qt::AlignTop);
+
+    m_layout->addRow(hbox);
+
+    connect(m_androidPackageSourceDir, &PathChooser::pathChanged,
+            m_wizard, &CreateAndroidManifestWizard::setDirectory);
+
+    if (wizard->copyGradle()) {
+        QCheckBox *checkBox = new QCheckBox(this);
+        checkBox->setChecked(true);
+        connect(checkBox, &QCheckBox::toggled, wizard, &CreateAndroidManifestWizard::setCopyGradle);
+        checkBox->setText(tr("Copy the Gradle files to Android directory"));
+        checkBox->setToolTip(tr("It is highly recommended if you are planning to extend the Java part of your Qt application."));
+        m_layout->addRow(checkBox);
+    }
+}
+
+void ChooseDirectoryPage::checkPackageSourceDir()
+{
+    const QString buildKey = m_wizard->buildKey();
+    const BuildTargetInfo bti = m_wizard->target()->applicationTargets().buildTargetInfo(buildKey);
+    const QString projectDir = bti.projectFilePath.toFileInfo().absolutePath();
+
+    const QString newDir = m_androidPackageSourceDir->path();
+    bool isComplete = QFileInfo(projectDir) != QFileInfo(newDir);
+
+    m_sourceDirectoryWarning->setVisible(!isComplete);
+    m_warningIcon->setVisible(!isComplete);
+
+    if (isComplete != m_complete) {
+        m_complete = isComplete;
+        emit completeChanged();
+    }
+}
+
+bool ChooseDirectoryPage::isComplete() const
+{
+    return m_complete;
+}
+
+void ChooseDirectoryPage::initializePage()
+{
+    const QString buildKey = m_wizard->buildKey();
+    const BuildTargetInfo bti = m_wizard->target()->applicationTargets().buildTargetInfo(buildKey);
+    const QString projectDir = bti.projectFilePath.toFileInfo().absolutePath();
+
+    AndroidQtSupport *qtSupport = AndroidManager::androidQtSupport(m_wizard->target());
+    const QString androidPackageDir
+            = qtSupport->targetDataItem(Android::Constants::AndroidPackageSourceDir, m_wizard->target());
+
+    if (androidPackageDir.isEmpty()) {
+        m_label->setText(tr("Select the Android package source directory.\n\n"
+                          "The files in the Android package source directory are copied to the build directory's "
+                          "Android directory and the default files are overwritten."));
+
+        m_androidPackageSourceDir->setPath(projectDir + "/android");
+        connect(m_androidPackageSourceDir, &PathChooser::rawPathChanged,
+                this, &ChooseDirectoryPage::checkPackageSourceDir);
+    } else {
+        m_label->setText(tr("The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file."));
+        m_androidPackageSourceDir->setPath(androidPackageDir);
+        m_androidPackageSourceDir->setReadOnly(true);
+    }
+
+
+    m_wizard->setDirectory(m_androidPackageSourceDir->path());
+}
+
+//
+// CreateAndroidManifestWizard
+//
+CreateAndroidManifestWizard::CreateAndroidManifestWizard(ProjectExplorer::Target *target)
+    : m_target(target), m_copyState(Ask)
+{
+    setWindowTitle(tr("Create Android Template Files Wizard"));
+
+    const BuildTargetInfoList buildTargets = target->applicationTargets();
+    QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
+    m_copyGradle = version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
+
+    if (buildTargets.list.isEmpty()) {
+        // oh uhm can't create anything
+        addPage(new NoApplicationProFilePage(this));
+    } else if (buildTargets.list.size() == 1) {
+        setBuildKey(buildTargets.list.first().buildKey);
+        addPage(new ChooseDirectoryPage(this));
+    } else {
+        addPage(new ChooseProFilePage(this));
+        addPage(new ChooseDirectoryPage(this));
+    }
+}
+
+QString CreateAndroidManifestWizard::buildKey() const
+{
+    return m_buildKey;
+}
+
+void CreateAndroidManifestWizard::setBuildKey(const QString &buildKey)
+{
+    m_buildKey = buildKey;
+}
+
+void CreateAndroidManifestWizard::setDirectory(const QString &directory)
+{
+    m_directory = directory;
+}
+
+bool CreateAndroidManifestWizard::copyGradle()
+{
+    return m_copyGradle;
+}
+
+void CreateAndroidManifestWizard::setCopyGradle(bool copy)
+{
+    m_copyGradle = copy;
+}
+
+bool CreateAndroidManifestWizard::copy(const QFileInfo &src, const QFileInfo &dst, QStringList * addedFiles)
+{
+    bool copyFile = true;
+    if (dst.exists()) {
+        switch (m_copyState) {
+        case Ask:
+            {
+                int res = QMessageBox::question(this,
+                                                tr("Overwrite %1 file").arg(dst.fileName()),
+                                                tr("Overwrite existing \"%1\"?")
+                                                    .arg(QDir(m_directory).relativeFilePath(dst.absoluteFilePath())),
+                                                QMessageBox::Yes | QMessageBox::YesToAll |
+                                                QMessageBox::No | QMessageBox::NoToAll |
+                                                QMessageBox::Cancel);
+                switch (res) {
+                case QMessageBox::YesToAll:
+                    m_copyState = OverwriteAll;
+                    break;
+
+                case QMessageBox::Yes:
+                    break;
+
+                case QMessageBox::NoToAll:
+                    m_copyState = SkipAll;
+                    copyFile = false;
+                    break;
+
+                case QMessageBox::No:
+                    copyFile = false;
+                    break;
+                default:
+                    return false;
+                }
+            }
+            break;
+        case SkipAll:
+            copyFile = false;
+            break;
+        default:
+            break;
+        }
+        if (copyFile)
+            QFile::remove(dst.filePath());
+    }
+
+    if (!dst.absoluteDir().exists())
+        dst.absoluteDir().mkpath(dst.absolutePath());
+
+    if (copyFile && !QFile::copy(src.filePath(), dst.filePath())) {
+        QMessageBox::warning(this, tr("File Creation Error"),
+                             tr("Could not copy file \"%1\" to \"%2\".")
+                                .arg(src.filePath()).arg(dst.filePath()));
+        return false;
+    }
+    addedFiles->append(dst.absoluteFilePath());
+    return true;
+}
+
+void CreateAndroidManifestWizard::createAndroidTemplateFiles()
+{
+    if (m_directory.isEmpty())
+        return;
+
+    QStringList addedFiles;
+    QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_target->kit());
+    if (!version)
+        return;
+    if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
+        const QString src(version->qmakeProperty("QT_INSTALL_PREFIX")
+                .append(QLatin1String("/src/android/java/AndroidManifest.xml")));
+        FileUtils::copyRecursively(FileName::fromString(src),
+                                   FileName::fromString(m_directory + QLatin1String("/AndroidManifest.xml")),
+                                   0, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
+    } else {
+        const QString src(version->qmakeProperty("QT_INSTALL_PREFIX")
+                          .append(QLatin1String("/src/android/templates")));
+
+        FileUtils::copyRecursively(FileName::fromString(src),
+                                   FileName::fromString(m_directory),
+                                   0, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
+
+        if (m_copyGradle) {
+            FileName gradlePath = FileName::fromString(version->qmakeProperty("QT_INSTALL_PREFIX").append(QLatin1String("/src/3rdparty/gradle")));
+            if (!gradlePath.exists())
+                gradlePath = AndroidConfigurations::currentConfig().sdkLocation().appendPath(QLatin1String("/tools/templates/gradle/wrapper"));
+            FileUtils::copyRecursively(gradlePath, FileName::fromString(m_directory),
+                                       0, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
+        }
+
+        AndroidManager::updateGradleProperties(m_target);
+    }
+
+    AndroidQtSupport *qtSupport = AndroidManager::androidQtSupport(m_target);
+    qtSupport->addFiles(m_target, m_buildKey, addedFiles);
+
+    const QString androidPackageDir
+            = qtSupport->targetDataItem(Android::Constants::AndroidPackageSourceDir, m_target);
+
+    if (androidPackageDir.isEmpty()) {
+        // and now time for some magic
+        const BuildTargetInfo bti = m_target->applicationTargets().buildTargetInfo(m_buildKey);
+        const QString value = "$$PWD/" + bti.projectFilePath.toFileInfo().absoluteDir().relativeFilePath(m_directory);
+        bool result = qtSupport->setTargetData(Android::Constants::AndroidPackageSourceDir, {value}, m_target);
+
+        if (!result) {
+            QMessageBox::warning(this, tr("Project File not Updated"),
+                                 tr("Could not update the project file %1.")
+                                 .arg(bti.projectFilePath.toUserOutput()));
+        }
+    }
+    Core::EditorManager::openEditor(m_directory + QLatin1String("/AndroidManifest.xml"));
+}
+
+ProjectExplorer::Target *CreateAndroidManifestWizard::target() const
+{
+    return m_target;
+}
+
+void CreateAndroidManifestWizard::accept()
+{
+    createAndroidTemplateFiles();
+    Wizard::accept();
+}
+
+} // namespace Android

src/plugins/android/createandroidmanifestwizard.h

@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include "android_global.h"
+
+#include <utils/fileutils.h>
+#include <utils/pathchooser.h>
+#include <utils/wizard.h>
+
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QLabel;
+class QFormLayout;
+QT_END_NAMESPACE
+
+namespace ProjectExplorer { class Target; }
+
+namespace Android {
+
+class CreateAndroidManifestWizard;
+
+class NoApplicationProFilePage : public QWizardPage
+{
+    Q_OBJECT
+public:
+    NoApplicationProFilePage(CreateAndroidManifestWizard *wizard);
+private:
+    CreateAndroidManifestWizard *m_wizard;
+};
+
+class ChooseProFilePage : public QWizardPage
+{
+    Q_OBJECT
+public:
+    explicit ChooseProFilePage(CreateAndroidManifestWizard *wizard);
+
+private:
+    void nodeSelected(int index);
+private:
+    CreateAndroidManifestWizard *m_wizard;
+    QComboBox *m_comboBox;
+};
+
+class ChooseDirectoryPage : public QWizardPage
+{
+    Q_OBJECT
+public:
+    ChooseDirectoryPage(CreateAndroidManifestWizard *wizard);
+    void initializePage();
+protected:
+    bool isComplete() const;
+private:
+    void checkPackageSourceDir();
+private:
+    CreateAndroidManifestWizard *m_wizard;
+    Utils::PathChooser *m_androidPackageSourceDir;
+    QLabel *m_sourceDirectoryWarning;
+    QLabel *m_warningIcon;
+    QLabel *m_label;
+    QFormLayout *m_layout;
+    bool m_complete;
+};
+
+class ANDROID_EXPORT CreateAndroidManifestWizard : public Utils::Wizard
+{
+    Q_OBJECT
+public:
+    CreateAndroidManifestWizard(ProjectExplorer::Target *target);
+
+    QString buildKey() const;
+    void setBuildKey(const QString &buildKey);
+
+    void accept();
+    bool copyGradle();
+
+    void setDirectory(const QString &directory);
+    void setCopyGradle(bool copy);
+
+    ProjectExplorer::Target *target() const;
+
+private:
+    enum CopyState {
+        Ask,
+        OverwriteAll,
+        SkipAll
+    };
+    bool copy(const QFileInfo &src, const QFileInfo &dst, QStringList *addedFiles);
+
+    void createAndroidManifestFile();
+    void createAndroidTemplateFiles();
+    ProjectExplorer::Target *m_target;
+    QString m_buildKey;
+    QString m_directory;
+    CopyState m_copyState;
+    bool m_copyGradle;
+};
+
+} // namespace Android