aboutsummaryrefslogtreecommitdiffstats
path: root/ide_common/src
diff options
context:
space:
mode:
Diffstat (limited to 'ide_common/src')
-rw-r--r--ide_common/src/com/android/ide/common/resources/ResourceResolver.java19
1 files changed, 14 insertions, 5 deletions
diff --git a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java b/ide_common/src/com/android/ide/common/resources/ResourceResolver.java
index 89a4cba..938a6ef 100644
--- a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java
+++ b/ide_common/src/com/android/ide/common/resources/ResourceResolver.java
@@ -67,14 +67,13 @@ public class ResourceResolver extends RenderResources {
}
/**
- * Creates a new ResourceResolver object.
+ * Creates a new {@link ResourceResolver} object.
*
- * @param IFrameworkResourceIdProvider an optional framework resource ID provider
* @param projectResources the project resources.
* @param frameworkResources the framework resources.
* @param themeName the name of the current theme.
* @param isProjectTheme Is this a project theme?
- * @return
+ * @return a new {@link ResourceResolver}
*/
public static ResourceResolver create(
Map<ResourceType, Map<String, ResourceValue>> projectResources,
@@ -231,12 +230,22 @@ public class ResourceResolver extends RenderResources {
}
// Now look for the item in the theme, starting with the current one.
+ ResourceValue item;
if (frameworkOnly) {
// FIXME for now we do the same as if it didn't specify android:
- return findItemInStyle(mTheme, referenceName);
+ item = findItemInStyle(mTheme, referenceName);
+ } else {
+ item = findItemInStyle(mTheme, referenceName);
+ }
+
+ if (item == null && mLogger != null) {
+ mLogger.warning(LayoutLog.TAG_RESOURCES_RESOLVE_THEME_ATTR,
+ String.format("Couldn't find theme resource %1$s for the current theme",
+ reference),
+ new ResourceValue(ResourceType.ATTR, referenceName, frameworkOnly));
}
- return findItemInStyle(mTheme, referenceName);
+ return item;
} else if (reference.startsWith(PREFIX_RESOURCE_REF)) {
boolean frameworkOnly = false;