Android: Add a activity line edit to the AndroidManifest editor

And remove code for handling @strings/app_name. The default template
hasn't used that for a while and it's pretty hard to properly support
that with both a activity and app setting.

Change-Id: I394b78e0a5380232efbc52e1c71d49d9696a9b00
Task-number: QTCREATORBUG-13958
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

src/plugins/android/androidmanifesteditorwidget.h

@@ -125,7 +125,6 @@ private slots:
     void addPermission();
     void removePermission();
     void updateAddRemovePermissionButtons();
-    void setAppName();
     void setPackageName();
     void updateInfoBar();
     void updateSdkVersions();
@@ -161,8 +160,6 @@ private:
 
     bool m_dirty; // indicates that we need to call syncToEditor()
     bool m_stayClean;
-    bool m_setAppName;
-    bool m_appNameInStringsXml;
     int m_errorLine;
     int m_errorColumn;
 
@@ -176,6 +173,7 @@ private:
 
     // Application
     QLineEdit *m_appNameLineEdit;
+    QLineEdit *m_activityNameLineEdit;
     QComboBox *m_targetLineEdit;
     QToolButton *m_lIconButton;
     QToolButton *m_mIconButton;