diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-14 16:11:58 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-02-14 16:35:06 -0800 |
| commit | 74bfc41355f973a8b1d93e1910c7fd7f20967408 (patch) | |
| tree | 56cffdb37990923851f5759557aad90ef0f0583a /eclipse | |
| parent | b8d178edb4c159ce4dbd5fe522d584d34ad2c042 (diff) | |
| download | sdk-74bfc41355f973a8b1d93e1910c7fd7f20967408.zip sdk-74bfc41355f973a8b1d93e1910c7fd7f20967408.tar.gz sdk-74bfc41355f973a8b1d93e1910c7fd7f20967408.tar.bz2 | |
All resource changes should trigger a layout rendering.
The current code didn't render if a layout changed
but <include> support was added (way back!) and this could
trigger the need for a recompile.
Change-Id: Icf34f0c03ad0b4108103e3dc12916fba988ea0b3
Diffstat (limited to 'eclipse')
2 files changed, 4 insertions, 9 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java index 380381b..a19a4db 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java @@ -62,7 +62,6 @@ public final class LayoutReloadMonitor { public boolean code = false; /** any non-layout resource changes */ public boolean resources = false; - public boolean layout = false; public boolean rClass = false; public boolean localeList = false; public boolean manifest = false; @@ -363,11 +362,7 @@ public final class LayoutReloadMonitor { mProjectFlags.put(project, changeFlags); } - if (resTypes[0] != ResourceType.LAYOUT) { - changeFlags.resources = true; - } else { - changeFlags.layout = true; - } + changeFlags.resources = true; } } }; 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 39a9172..5e811bf 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 @@ -1641,7 +1641,8 @@ public class GraphicalEditorPart extends EditorPart assert mConfigComposite.getDisplay().getThread() == Thread.currentThread(); boolean recompute = false; - if (flags.rClass) { + // we only care about the r class of the main project. + if (flags.rClass && libraryChanged == false) { recompute = true; if (mEditedFile != null) { ResourceManager manager = ResourceManager.getInstance(); @@ -1664,8 +1665,7 @@ public class GraphicalEditorPart extends EditorPart } // if a resources was modified. - // also, if a layout in a library was modified. - if (flags.resources || (libraryChanged && flags.layout)) { + if (flags.resources) { recompute = true; // TODO: differentiate between single and multi resource file changed, and whether |