Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev (d3ac01ff) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -613,19 +613,16 @@ public final class BridgeContext extends Context {
		}

		if (value != null) {
		if ((value.getFirst() == ResourceType.STYLE)
		\|\| (value.getFirst() == ResourceType.ATTR)) {
		// look for the style in the current theme, and its parent:
		ResourceValue item = mRenderResources.findItemInTheme(value.getSecond(),
		if (value.getFirst() == ResourceType.STYLE) {
		// look for the style in all resources:
		StyleResourceValue item = mRenderResources.getStyle(value.getSecond(),
		isFrameworkRes);
		if (item != null) {
		if (item instanceof StyleResourceValue) {
		if (defaultPropMap != null) {
		defaultPropMap.put("style", item.getName());
		}

		defStyleValues = (StyleResourceValue)item;
		}
		defStyleValues = item;
		} else {
		Bridge.getLog().error(null,
		String.format(