diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2015-07-06 12:54:12 +0100 |
|---|---|---|
| committer | Jerome Gaillard <jgaillard@google.com> | 2015-07-14 13:03:23 +0100 |
| commit | 8590eeba2885badc0c7e45f8fc2bf3411c1b0841 (patch) | |
| tree | fd2f6847faf6d549ea011901c6aaa7e42aa13638 /designer | |
| parent | 5ff01f48a44de0bb5669aa8e5aea775c316bcb52 (diff) | |
| download | idea-8590eeba2885badc0c7e45f8fc2bf3411c1b0841.tar.gz | |
Fix the updating of files after modifying statelists
Uses Psi files to make sure that one always works with
the most up-to-date version of the resource files.
Bug: http://b.android.com/174955
Change-Id: I44cb74c574bce66ea65b16862b40636580d81bfa
Diffstat (limited to 'designer')
| -rw-r--r-- | designer/src/com/android/tools/idea/uibuilder/palette/NlPalettePanel.java | 4 | ||||
| -rw-r--r-- | designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/designer/src/com/android/tools/idea/uibuilder/palette/NlPalettePanel.java b/designer/src/com/android/tools/idea/uibuilder/palette/NlPalettePanel.java index 16eaa235af1..ffa8aaf1139 100644 --- a/designer/src/com/android/tools/idea/uibuilder/palette/NlPalettePanel.java +++ b/designer/src/com/android/tools/idea/uibuilder/palette/NlPalettePanel.java @@ -155,12 +155,12 @@ public class NlPalettePanel extends JPanel implements LightToolWindowContent, Co background = UIUtil.getTreeBackground(); } else { ResourceValue windowBackground = resolver.findItemInTheme("colorBackground", true); - background = ResourceHelper.resolveColor(resolver, windowBackground); + background = ResourceHelper.resolveColor(resolver, windowBackground, configuration.getModule().getProject()); if (background == null) { background = UIUtil.getTreeBackground(); } ResourceValue textForeground = resolver.findItemInTheme("colorForeground", true); - foreground = ResourceHelper.resolveColor(resolver, textForeground); + foreground = ResourceHelper.resolveColor(resolver, textForeground, configuration.getModule().getProject()); if (foreground == null) { foreground = UIUtil.getTreeForeground(); } diff --git a/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java b/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java index 93b56940743..beb7a7b44ec 100644 --- a/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java +++ b/designer/src/com/android/tools/idea/uibuilder/property/renderer/NlDefaultRenderer.java @@ -117,7 +117,7 @@ public class NlDefaultRenderer extends NlAttributeRenderer implements NlProperty return null; } - File file = AndroidColorAnnotator.pickBestBitmap(ResourceHelper.resolveDrawable(resolver, drawable)); + File file = AndroidColorAnnotator.pickBestBitmap(ResourceHelper.resolveDrawable(resolver, drawable, property.getComponent().getModel().getProject())); return file == null ? null : GutterIconCache.getInstance().getIcon(file.getPath()); } |