From 29cb63828fc2f12e16a8bbb17f553f7b28a01ebb Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Tue, 14 Jul 2015 10:45:38 +0100 Subject: Fix build broken by http://r.android.com/172415 And revert temporary fix introduced in http://r.android.com/159296 Change-Id: I7cd556d4bc3119c41b9066a408adacf5a30ac156 --- .../src/org/jetbrains/android/uipreview/ChooseResourceDialog.java | 6 +++++- .../tools/idea/uibuilder/property/editors/NlReferenceEditor.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/android/src/org/jetbrains/android/uipreview/ChooseResourceDialog.java b/android/src/org/jetbrains/android/uipreview/ChooseResourceDialog.java index ffd37750d9e..6adfcf10b5a 100644 --- a/android/src/org/jetbrains/android/uipreview/ChooseResourceDialog.java +++ b/android/src/org/jetbrains/android/uipreview/ChooseResourceDialog.java @@ -695,7 +695,7 @@ public class ChooseResourceDialog extends DialogWrapper implements TreeSelection } for (int i = 0; i < types.length; i++) { - myGroups[i] = new ResourceGroup(types[i], myManager, true); + myGroups[i] = new ResourceGroup(types[i], myManager); } myTreeBuilder = @@ -918,6 +918,10 @@ public class ChooseResourceDialog extends DialogWrapper implements TreeSelection private List myItems = new ArrayList(); private final ResourceType myType; + public ResourceGroup(ResourceType type, ResourceManager manager) { + this(type, manager, true); + } + public ResourceGroup(ResourceType type, ResourceManager manager, boolean includeFileResources) { myType = type; diff --git a/designer/src/com/android/tools/idea/uibuilder/property/editors/NlReferenceEditor.java b/designer/src/com/android/tools/idea/uibuilder/property/editors/NlReferenceEditor.java index e1192fb457a..53e2d0c60a5 100644 --- a/designer/src/com/android/tools/idea/uibuilder/property/editors/NlReferenceEditor.java +++ b/designer/src/com/android/tools/idea/uibuilder/property/editors/NlReferenceEditor.java @@ -206,13 +206,13 @@ public class NlReferenceEditor extends PTableCellEditor implements ActionListene for (ResourceType type : types) { List resItems = - new ChooseResourceDialog.ResourceGroup(type, facet.getLocalResourceManager(), true).getItems(); + new ChooseResourceDialog.ResourceGroup(type, facet.getLocalResourceManager()).getItems(); items.addAll(getResNames(resItems, SdkConstants.PREFIX_RESOURCE_REF)); } for (ResourceType type : types) { List resItems = - new ChooseResourceDialog.ResourceGroup(type, facet.getSystemResourceManager(), true).getItems(); + new ChooseResourceDialog.ResourceGroup(type, facet.getSystemResourceManager()).getItems(); items.addAll(getResNames(resItems, SdkConstants.ANDROID_PREFIX)); } -- cgit v1.2.3