drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue with project resources overriding framework resources." into gingerbread

Browse Source
This commit is contained in:
Xavier Ducrohet
2010-10-27 11:22:22 -07:00
committed by Android (Google) Code Review
parent 8b023a2ea2 c2e28dd748
commit 63e5d07ec9
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
View File

@ -266,7 +266,7 @@ public final class BridgeContext extends Context {
customStyle = parser.getAttributeValue(null /* namespace*/, "style");
}
if (customStyle != null) {
IResourceValue item = findResValue(customStyle);
IResourceValue item = findResValue(customStyle, false /*forceFrameworkOnly*/);
if (item instanceof IStyleResourceValue) {
defStyleValues = (IStyleResourceValue)item;
@ -283,7 +283,7 @@ public final class BridgeContext extends Context {
if (item != null) {
// item is a reference to a style entry. Search for it.
item = findResValue(item.getValue());
item = findResValue(item.getValue(), false /*forceFrameworkOnly*/);
if (item instanceof IStyleResourceValue) {
defStyleValues = (IStyleResourceValue)item;
@ -413,7 +413,7 @@ public final class BridgeContext extends Context {
}
// get the IResourceValue referenced by this value
IResourceValue resValue = findResValue(value);
IResourceValue resValue = findResValue(value, false /*forceFrameworkOnly*/);
// if resValue is null, but value is not null, this means it was not a reference.
// we return the name/value wrapper in a IResourceValue
@ -449,7 +449,7 @@ public final class BridgeContext extends Context {
}
// else attempt to find another IResourceValue referenced by this one.
IResourceValue resolvedValue = findResValue(value.getValue());
IResourceValue resolvedValue = findResValue(value.getValue(), value.isFramework());
// if the value did not reference anything, then we simply return the input value
if (resolvedValue == null) {
@ -476,9 +476,11 @@ public final class BridgeContext extends Context {
* only support the android namespace.
*
* @param reference the resource reference to search for.
* @param forceFrameworkOnly if true all references are considered to be toward framework
* resource even if the reference does not include the android: prefix.
* @return a {@link IResourceValue} or <code>null</code>.
*/
IResourceValue findResValue(String reference) {
IResourceValue findResValue(String reference, boolean forceFrameworkOnly) {
if (reference == null) {
return null;
}
@ -560,7 +562,8 @@ public final class BridgeContext extends Context {
segments[1] = segments[1].substring(BridgeConstants.PREFIX_ANDROID.length());
}
return findResValue(segments[0], segments[1], frameworkOnly);
return findResValue(segments[0], segments[1],
forceFrameworkOnly ? true :frameworkOnly);
}
// Looks like the value didn't reference anything. Return null.

23
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeXmlPullAttributes.java
View File

@ -41,7 +41,7 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
/*
* (non-Javadoc)
* @see android.util.XmlPullAttributes#getAttributeNameResource(int)
*
*
* This methods must return com.android.internal.R.attr.<name> matching
* the name of the attribute.
* It returns 0 if it doesn't find anything.
@ -50,19 +50,19 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
public int getAttributeNameResource(int index) {
// get the attribute name.
String name = getAttributeName(index);
// get the attribute namespace
String ns = mParser.getAttributeNamespace(index);
if (BridgeConstants.NS_RESOURCES.equals(ns)) {
Integer v = Bridge.getResourceValue(BridgeConstants.RES_ATTR, name);
if (v != null) {
return v.intValue();
}
return 0;
}
// this is not an attribute in the android namespace, we query the customviewloader, if
// the namespaces match.
if (mContext.getProjectCallback().getNamespace().equals(ns)) {
@ -75,7 +75,7 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
return 0;
}
/*
* (non-Javadoc)
* @see android.util.XmlPullAttributes#getAttributeResourceValue(int, int)
@ -83,7 +83,7 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
@Override
public int getAttributeResourceValue(int index, int defaultValue) {
String value = getAttributeValue(index);
return resolveResourceValue(value, defaultValue);
}
@ -94,14 +94,15 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
@Override
public int getAttributeResourceValue(String namespace, String attribute, int defaultValue) {
String value = getAttributeValue(namespace, attribute);
return resolveResourceValue(value, defaultValue);
}
private int resolveResourceValue(String value, int defaultValue) {
// now look for this particular value
IResourceValue resource = mContext.resolveResValue(mContext.findResValue(value));
IResourceValue resource = mContext.resolveResValue(
mContext.findResValue(value, mPlatformFile));
if (resource != null) {
Integer id = null;
if (mPlatformFile || resource.isFramework()) {
@ -115,7 +116,7 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
return id;
}
}
return defaultValue;
}

3
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/ResourceHelper.java
View File

@ -148,8 +148,7 @@ public final class ResourceHelper {
parser.setInput(new FileReader(f));
d = Drawable.createFromXml(context.getResources(),
// FIXME: we need to know if this resource is platform or not
new BridgeXmlBlockParser(parser, context, false));
new BridgeXmlBlockParser(parser, context, isFramework));
return d;
} catch (XmlPullParserException e) {
context.getLogger().error(e);