diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-01-28 12:52:13 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-01-28 12:52:13 -0800 |
| commit | 2e97908089f76b4c270f018cbd2e1762511df183 (patch) | |
| tree | bf5bd715242a79cd9d63cfd5e805dd5aa3ea5893 | |
| parent | a23400726c6e785792cc12858075fc936b8b71de (diff) | |
| download | sdk-2e97908089f76b4c270f018cbd2e1762511df183.zip sdk-2e97908089f76b4c270f018cbd2e1762511df183.tar.gz sdk-2e97908089f76b4c270f018cbd2e1762511df183.tar.bz2 | |
Fix compilation errors due to 2 independent changes.
Change-Id: Ib7aa41aa6c95ec17ffde2644320b851f8f02f85f
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 4e66bb0..8e94358 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 @@ -1703,11 +1703,11 @@ public class GraphicalEditorPart extends EditorPart ResourceResolver createResolver() { String theme = mConfigComposite.getTheme(); boolean isProjectTheme = mConfigComposite.isProjectTheme(); - Map<String, Map<String, ResourceValue>> configuredProjectRes = + Map<ResourceType, Map<String, ResourceValue>> configuredProjectRes = mConfigListener.getConfiguredProjectResources(); // Get the framework resources - Map<String, Map<String, ResourceValue>> frameworkResources = + Map<ResourceType, Map<String, ResourceValue>> frameworkResources = mConfigListener.getConfiguredFrameworkResources(); return ResourceResolver.create( |