1 files changed, 14 insertions, 39 deletions

diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 8e38773cd6..7a69ac49ad 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -52,8 +52,10 @@ namespace Core { class IEditor; }
 namespace Android {
 namespace Internal {
 class AndroidManifestEditor;
+class AndroidManifestEditorIconContainerWidget;
 class AndroidManifestEditorWidget;
-
+class AndroidServiceWidget;
+class SplashIconContainerWidget;
 
 class PermissionsModel: public QAbstractListModel
 {
@@ -78,7 +80,6 @@ class AndroidManifestTextEditorWidget : public TextEditor::TextEditorWidget
 {
 public:
     explicit AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent);
-    ~AndroidManifestTextEditorWidget() override;
 
 private:
     Core::IContext *m_context;
@@ -116,21 +117,6 @@ protected:
     void focusInEvent(QFocusEvent *event) override;
 
 private:
-    void setMasterIcon();
-    void clearMasterIcon();
-    void setLDPIIcon();
-    void setMDPIIcon();
-    void setHDPIIcon();
-    void clearLDPIIcon();
-    void clearMDPIIcon();
-    void clearHDPIIcon();
-    void createDPIButton(QHBoxLayout *layout,
-                         QWidget *parent,
-                         QToolButton *&button, const QSize &buttonSize,
-                         const QString &title, const QString &tooltip,
-                         QToolButton **clearButton = nullptr,
-                         QLabel **scaleWarningLabel = nullptr
-                         );
     void defaultPermissionOrFeatureCheckBoxClicked();
     void addPermission();
     void removePermission();
@@ -148,21 +134,19 @@ private:
 
     bool checkDocument(const QDomDocument &doc, QString *errorMessage,
                        int *errorLine, int *errorColumn);
-    enum IconDPI { LowDPI, MediumDPI, HighDPI };
-    QIcon icon(const QString &baseDir, IconDPI dpi);
-    QString iconPath(IconDPI dpi);
-    QSize iconSize(IconDPI dpi);
-    void updateIconPath(const QString &newPath, IconDPI dpi);
-    void copyIcon(IconDPI dpi, const QString &baseDir, const QString &filePath);
-    void removeIcon(IconDPI dpi, const QString &baseDir);
-    void toggleIconScaleWarning(IconDPI dpi, bool visible);
 
     void updateInfoBar(const QString &errorMessage, int line, int column);
     void hideInfoBar();
+    void setInvalidServiceInfo();
+    void clearInvalidServiceInfo();
+
     void updateTargetComboBox();
 
     void parseManifest(QXmlStreamReader &reader, QXmlStreamWriter &writer);
     void parseApplication(QXmlStreamReader &reader, QXmlStreamWriter &writer);
+    void parseSplashScreen(QXmlStreamWriter &writer);
+    void parseService(QXmlStreamReader &reader, QXmlStreamWriter &writer);
+    void parseNewServices(QXmlStreamWriter &writer);
     void parseActivity(QXmlStreamReader &reader, QXmlStreamWriter &writer);
     bool parseMetaData(QXmlStreamReader &reader, QXmlStreamWriter &writer);
     void parseUsesSdk(QXmlStreamReader &reader, QXmlStreamWriter &writer);
@@ -170,7 +154,7 @@ private:
                                 QXmlStreamWriter &writer,
                                 const QSet<QString> &permissions);
     QString parseComment(QXmlStreamReader &reader, QXmlStreamWriter &writer);
-    void parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer);
+    void parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer, bool ignore=false);
 
     bool m_dirty; // indicates that we need to call syncToEditor()
     bool m_stayClean;
@@ -190,19 +174,8 @@ private:
     QLineEdit *m_activityNameLineEdit;
     QComboBox *m_targetLineEdit;
     QComboBox *m_styleExtractMethod;
-    QToolButton *m_masterIconButton;
-    QToolButton *m_lIconButton;
-    QToolButton *m_lIconClearButton;
-    QLabel *m_lIconScaleWarningLabel;
-    QToolButton *m_mIconButton;
-    QToolButton *m_mIconClearButton;
-    QLabel *m_mIconScaleWarningLabel;
-    QToolButton *m_hIconButton;
-    QToolButton *m_hIconClearButton;
-    QLabel *m_hIconScaleWarningLabel;
-    QString m_lIconPath;
-    QString m_mIconPath;
-    QString m_hIconPath;
+    AndroidManifestEditorIconContainerWidget *m_iconButtons;
+    SplashIconContainerWidget *m_splashButtons;
 
     // Permissions
     QCheckBox *m_defaultPermissonsCheckBox;
@@ -213,6 +186,8 @@ private:
     QPushButton *m_removePermissionButton;
     QComboBox *m_permissionsComboBox;
 
+    // Services
+    AndroidServiceWidget *m_services;
     QTimer m_timerParseCheck;
     TextEditor::TextEditorWidget *m_textEditorWidget;
     AndroidManifestEditor *m_editor;