diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-08-31 10:53:14 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-08-31 10:53:14 -0700 |
| commit | e321ea01d5dc30016203e1a5c68ad997b25ae35c (patch) | |
| tree | 6fe479fd5f0ecdcc871ac63dadcfed14daf04878 | |
| parent | 0b5b3edc79c75602b269fa9a0fdca842b408c4d5 (diff) | |
| parent | 7d43d59829e89e196eecdc905637f0900ff0d391 (diff) | |
| download | sdk-e321ea01d5dc30016203e1a5c68ad997b25ae35c.zip sdk-e321ea01d5dc30016203e1a5c68ad997b25ae35c.tar.gz sdk-e321ea01d5dc30016203e1a5c68ad997b25ae35c.tar.bz2 | |
Merge "Icons for explode and outline toggle in the Layout Editor."
4 files changed, 9 insertions, 8 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/explode.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/explode.png Binary files differnew file mode 100644 index 0000000..f250055 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt/icons/explode.png diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/icons/outline.png b/eclipse/plugins/com.android.ide.eclipse.adt/icons/outline.png Binary files differnew file mode 100644 index 0000000..dbfb63b --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt/icons/outline.png diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle1/GraphicalLayoutEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle1/GraphicalLayoutEditor.java index 06a7ba4..1309273 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle1/GraphicalLayoutEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle1/GraphicalLayoutEditor.java @@ -240,8 +240,8 @@ public class GraphicalLayoutEditor extends GraphicalEditorWithPalette CustomToggle[] toggles = new CustomToggle[] { new CustomToggle( - "Explode", - null, //image + null, //text + IconFactory.getInstance().getIcon("explode"), "Displays extra margins in the layout." ) { @Override @@ -251,8 +251,8 @@ public class GraphicalLayoutEditor extends GraphicalEditorWithPalette } }, new CustomToggle( - "Outline", - null, //image + null, //text + IconFactory.getInstance().getIcon("outline"), "Shows the outline of all views in the layout." ) { @Override 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 2daaae5..f36d9d5 100755 --- 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 @@ -17,6 +17,7 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; import com.android.ide.eclipse.adt.AdtPlugin; +import com.android.ide.eclipse.adt.internal.editors.IconFactory; import com.android.ide.eclipse.adt.internal.editors.layout.ExplodedRenderingHelper; import com.android.ide.eclipse.adt.internal.editors.layout.IGraphicalLayoutEditor; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditor; @@ -258,8 +259,8 @@ public class GraphicalEditorPart extends EditorPart } }, new CustomToggle( - "Explode", - null, //image + null, //text + IconFactory.getInstance().getIcon("explode"), "Displays extra margins in the layout." ) { @Override @@ -269,8 +270,8 @@ public class GraphicalEditorPart extends EditorPart } }, new CustomToggle( - "Outline", - null, //image + null, //text + IconFactory.getInstance().getIcon("outline"), "Shows the of all views in the layout." ) { @Override |
