Icons for the XML editor page tabs.

Change-Id: I34b0b2fd34a0e503c4eb9656ed36979af22ec6ce

13 files changed, 148 insertions, 22 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_design.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_design.png
new file mode 100755
index 0000000..a19f3b0
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_design.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_source.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_source.png
new file mode 100755
index 0000000..874cc1e
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/icons/editor_page_source.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidXmlEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidXmlEditor.java
index 0f02aae..b4fa333 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidXmlEditor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidXmlEditor.java
@@ -233,6 +233,36 @@ public abstract class AndroidXmlEditor extends FormEditor implements IResourceCh
     }
 
     /**
+     * {@inheritDoc}
+     * <p/>
+     * If the page is an instance of {@link IPageImageProvider}, the image returned by
+     * by {@link IPageImageProvider#getPageImage()} will be set on the page's tab.
+     */
+    @Override
+    public int addPage(IFormPage page) throws PartInitException {
+        int index = super.addPage(page);
+        if (page instanceof IPageImageProvider) {
+            setPageImage(index, ((IPageImageProvider) page).getPageImage());
+        }
+        return index;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p/>
+     * If the editor is an instance of {@link IPageImageProvider}, the image returned by
+     * by {@link IPageImageProvider#getPageImage()} will be set on the page's tab.
+     */
+    @Override
+    public int addPage(IEditorPart editor, IEditorInput input) throws PartInitException {
+        int index = super.addPage(editor, input);
+        if (editor instanceof IPageImageProvider) {
+            setPageImage(index, ((IPageImageProvider) editor).getPageImage());
+        }
+        return index;
+    }
+
+    /**
      * Creates undo redo actions for the editor site (so that it works for any page of this
      * multi-page editor) by re-using the actions defined by the {@link StructuredTextEditor}
      * (aka the XML text editor.)
@@ -578,6 +608,8 @@ public abstract class AndroidXmlEditor extends FormEditor implements IResourceCh
             int index = addPage(mTextEditor, getEditorInput());
             mTextPageIndex = index;
             setPageText(index, mTextEditor.getTitle());
+            setPageImage(index,
+                    IconFactory.getInstance().getIcon("editor_page_source")); //$NON-NLS-1$
 
             if (!(mTextEditor.getTextViewer().getDocument() instanceof IStructuredDocument)) {
                 Status status = new Status(IStatus.ERROR, AdtPlugin.PLUGIN_ID,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/IPageImageProvider.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/IPageImageProvider.java
new file mode 100755
index 0000000..7cd80ec
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/IPageImageProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Eclipse Public License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.eclipse.org/org/documents/epl-v10.php
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.adt.internal.editors;
+
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Interface that editor pages can implement to provide an icon
+ * for the page tab in the XML editor.
+ */
+public interface IPageImageProvider {
+
+    /**
+     * Returns an {@link Image} that the editor will display in the page's tab.
+     *
+     * @return An {@link Image} for the editor tab for this page. Null for no image.
+     */
+    Image getPageImage();
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java
index 2124aae..a520fdf 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java
@@ -212,7 +212,7 @@ public class LayoutEditor extends AndroidXmlEditor implements IShowEditorInput,
         } catch (PartInitException e) {
             AdtPlugin.log(e, "Error creating nested page"); //$NON-NLS-1$
         }
-     }
+    }
 
     @Override
     protected void postCreatePages() {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
index cce6c2a..920a8e4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
@@ -22,6 +22,7 @@ import com.android.ide.common.layoutlib.BasicLayoutScene;
 import com.android.ide.common.layoutlib.LayoutLibrary;
 import com.android.ide.common.sdk.LoadStatus;
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
 import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.layout.ContextPullParser;
 import com.android.ide.eclipse.adt.internal.editors.layout.ExplodedRenderingHelper;
@@ -95,6 +96,7 @@ import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -141,7 +143,7 @@ import java.util.Set;
  * @since GLE2
  */
 public class GraphicalEditorPart extends EditorPart
-    implements ISelectionListener, INullSelectionListener {
+    implements IPageImageProvider, ISelectionListener, INullSelectionListener {
 
     /*
      * Useful notes:
@@ -262,6 +264,10 @@ public class GraphicalEditorPart extends EditorPart
         }
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon("editor_page_design");  //$NON-NLS-1$
+    }
+
     @Override
     public void createPartControl(Composite parent) {
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/ApplicationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/ApplicationPage.java
index 3862a1e..96cb0a6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/ApplicationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/ApplicationPage.java
@@ -17,6 +17,8 @@
 package com.android.ide.eclipse.adt.internal.editors.manifest.pages;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.ManifestEditor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors;
@@ -24,6 +26,7 @@ import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.IManagedForm;
@@ -39,7 +42,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
  * <a href="http://www.eclipse.org/articles/Article-Forms/article.html">
  *   http://www.eclipse.org/articles/Article-Forms/article.html</a>
  */
-public final class ApplicationPage extends FormPage {
+public final class ApplicationPage extends FormPage implements IPageImageProvider {
     /** Page id used for switching tabs programmatically */
     public final static String PAGE_ID = "application_page"; //$NON-NLS-1$
 
@@ -47,7 +50,7 @@ public final class ApplicationPage extends FormPage {
     ManifestEditor mEditor;
     /** The Application Toogle part */
     private ApplicationToggle mTooglePart;
-    /** The Application Attributes part */ 
+    /** The Application Attributes part */
     private ApplicationAttributesPart mAttrPart;
     /** The tree view block */
     private UiTreeBlock mTreeBlock;
@@ -57,9 +60,15 @@ public final class ApplicationPage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon(getTitle(),
+                                                 IconFactory.COLOR_BLUE,
+                                                 IconFactory.SHAPE_RECT);
+    }
+
     /**
      * Creates the content in the form hosted in this page.
-     * 
+     *
      * @param managedForm the form hosted in this page.
      */
     @Override
@@ -73,7 +82,7 @@ public final class ApplicationPage extends FormPage {
 
         Composite body = form.getBody();
         FormToolkit toolkit = managedForm.getToolkit();
-        
+
         // We usually prefer to have a ColumnLayout here. However
         // MasterDetailsBlock.createContent() below will reset the body's layout to a grid layout.
         mTooglePart = new ApplicationToggle(body, toolkit, mEditor, appUiNode);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/InstrumentationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/InstrumentationPage.java
index 41063d5..e630862 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/InstrumentationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/InstrumentationPage.java
@@ -17,12 +17,15 @@
 package com.android.ide.eclipse.adt.internal.editors.manifest.pages;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.ManifestEditor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors;
 import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -30,7 +33,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 /**
  * Page for instrumentation settings, part of the AndroidManifest form editor.
  */
-public final class InstrumentationPage extends FormPage {
+public final class InstrumentationPage extends FormPage implements IPageImageProvider {
     /** Page id used for switching tabs programmatically */
     public final static String PAGE_ID = "instrumentation_page"; //$NON-NLS-1$
 
@@ -44,9 +47,15 @@ public final class InstrumentationPage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon(getTitle(),
+                                                 IconFactory.COLOR_GREEN,
+                                                 IconFactory.SHAPE_RECT);
+    }
+
     /**
      * Creates the content in the form hosted in this page.
-     * 
+     *
      * @param managedForm the form hosted in this page.
      */
     @Override
@@ -73,7 +82,7 @@ public final class InstrumentationPage extends FormPage {
                 "List of instrumentations defined in the manifest");
         mTreeBlock.createContent(managedForm);
     }
-    
+
     /**
      * Changes and refreshes the Application UI node handled by the sub parts.
      */
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewPage.java
index 64af2ae..84ba67f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewPage.java
@@ -17,6 +17,8 @@
 package com.android.ide.eclipse.adt.internal.editors.manifest.pages;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.ManifestEditor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors;
@@ -24,6 +26,7 @@ import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.IManagedForm;
@@ -42,7 +45,7 @@ import java.util.HashSet;
  * <a href="http://www.eclipse.org/articles/Article-Forms/article.html">
  *   http://www.eclipse.org/articles/Article-Forms/article.html</a>
  */
-public final class OverviewPage extends FormPage {
+public final class OverviewPage extends FormPage implements IPageImageProvider {
 
     /** Page id used for switching tabs programmatically */
     final static String PAGE_ID = "overview_page"; //$NON-NLS-1$
@@ -61,6 +64,10 @@ public final class OverviewPage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon("editor_page_design");  //$NON-NLS-1$
+    }
+
     /**
      * Creates the content in the form hosted in this page.
      *
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/PermissionPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/PermissionPage.java
index 8f3e7ff..863db03 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/PermissionPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/PermissionPage.java
@@ -17,12 +17,15 @@
 package com.android.ide.eclipse.adt.internal.editors.manifest.pages;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.ManifestEditor;
 import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors;
 import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -34,7 +37,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
  * <a href="http://www.eclipse.org/articles/Article-Forms/article.html">
  *   http://www.eclipse.org/articles/Article-Forms/article.html</a>
  */
-public final class PermissionPage extends FormPage {
+public final class PermissionPage extends FormPage implements IPageImageProvider {
     /** Page id used for switching tabs programmatically */
     public final static String PAGE_ID = "permission_page"; //$NON-NLS-1$
 
@@ -48,9 +51,15 @@ public final class PermissionPage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon(getTitle(),
+                                                 IconFactory.COLOR_RED,
+                                                 IconFactory.SHAPE_RECT);
+    }
+
     /**
      * Creates the content in the form hosted in this page.
-     * 
+     *
      * @param managedForm the form hosted in this page.
      */
     @Override
@@ -62,7 +71,7 @@ public final class PermissionPage extends FormPage {
 
         UiElementNode manifest = mEditor.getUiRootNode();
         AndroidManifestDescriptors manifestDescriptor = mEditor.getManifestDescriptors();
-        
+
         ElementDescriptor[] descriptorFilters = null;
         if (manifestDescriptor != null) {
             descriptorFilters = new ElementDescriptor[] {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/MenuTreePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/MenuTreePage.java
index c324802..f7e6322 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/MenuTreePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/MenuTreePage.java
@@ -17,9 +17,12 @@
 package com.android.ide.eclipse.adt.internal.editors.menu;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -27,7 +30,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 /**
  * Page for the menu form editor.
  */
-public final class MenuTreePage extends FormPage {
+public final class MenuTreePage extends FormPage implements IPageImageProvider {
     /** Page id used for switching tabs programmatically */
     public final static String PAGE_ID = "layout_tree_page"; //$NON-NLS-1$
 
@@ -39,9 +42,13 @@ public final class MenuTreePage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon("editor_page_design");  //$NON-NLS-1$
+    }
+
     /**
      * Creates the content in the form hosted in this page.
-     * 
+     *
      * @param managedForm the form hosted in this page.
      */
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/ResourcesTreePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/ResourcesTreePage.java
index eac593a..2c383b3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/ResourcesTreePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/ResourcesTreePage.java
@@ -17,12 +17,15 @@
 package com.android.ide.eclipse.adt.internal.editors.resources;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
@@ -32,7 +35,7 @@ import org.eclipse.ui.part.FileEditorInput;
 /**
  * Page for instrumentation settings, part of the AndroidManifest form editor.
  */
-public final class ResourcesTreePage extends FormPage {
+public final class ResourcesTreePage extends FormPage implements IPageImageProvider {
     /** Page id used for switching tabs programmatically */
     public final static String PAGE_ID = "res_tree_page"; //$NON-NLS-1$
 
@@ -44,28 +47,32 @@ public final class ResourcesTreePage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon("editor_page_design");  //$NON-NLS-1$
+    }
+
     /**
      * Creates the content in the form hosted in this page.
-     * 
+     *
      * @param managedForm the form hosted in this page.
      */
     @Override
     protected void createFormContent(IManagedForm managedForm) {
         super.createFormContent(managedForm);
         ScrolledForm form = managedForm.getForm();
-        
+
         String configText = null;
         IEditorInput input = mEditor.getEditorInput();
         if (input instanceof FileEditorInput) {
             FileEditorInput fileInput = (FileEditorInput)input;
             IFile iFile = fileInput.getFile();
-            
+
             ResourceFolder resFolder = ResourceManager.getInstance().getResourceFolder(iFile);
             if (resFolder != null) {
                 configText = resFolder.getConfiguration().toDisplayString();
             }
         }
-        
+
         if (configText != null) {
             form.setText(String.format("Android Resources (%1$s)", configText));
         } else {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/XmlTreePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/XmlTreePage.java
index 14b4662..9284796 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/XmlTreePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/XmlTreePage.java
@@ -17,9 +17,12 @@
 package com.android.ide.eclipse.adt.internal.editors.xml;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
+import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.ui.tree.UiTreeBlock;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -27,7 +30,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 /**
  * Page for the xml form editor.
  */
-public final class XmlTreePage extends FormPage {
+public final class XmlTreePage extends FormPage implements IPageImageProvider {
     /** Page id used for switching tabs programmatically */
     public final static String PAGE_ID = "xml_tree_page"; //$NON-NLS-1$
 
@@ -39,9 +42,13 @@ public final class XmlTreePage extends FormPage {
         mEditor = editor;
     }
 
+    public Image getPageImage() {
+        return IconFactory.getInstance().getIcon("editor_page_design");  //$NON-NLS-1$
+    }
+
     /**
      * Creates the content in the form hosted in this page.
-     * 
+     *
      * @param managedForm the form hosted in this page.
      */
     @Override