Merge change Iae493184 into eclair (19e420c5) · Commits · e / os / android_frameworks_base

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

+11 −8

Original line number	Diff line number	Diff line
		@@ -675,9 +675,12 @@ public final class Bridge implements ILayoutBridge {
		name = name.substring(BridgeConstants.PREFIX_ANDROID.length());
		}

		// at this point we could have the format style/<name>. we want only the name
		// at this point we could have the format <type>/<name>. we want only the name as long as
		// the type is style.
		if (name.startsWith(BridgeConstants.REFERENCE_STYLE)) {
		name = name.substring(BridgeConstants.REFERENCE_STYLE.length());
		} else if (name.indexOf('/') != -1) {
		return null;
		}

		IResourceValue parent = null;
		@@ -697,7 +700,7 @@ public final class Bridge implements ILayoutBridge {
		return (IStyleResourceValue)parent;
		}

		sLogger.error(String.format("Unable to resolve parent style name: ", parentName));
		sLogger.error(String.format("Unable to resolve parent style name: %s", parentName));

		return null;
		}