Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread

Browse Source 
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp

* commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a':
  Parser is optional in obtainStyledAttributes.
This commit is contained in:
Xavier Ducrohet
2010-10-07 07:16:51 -07:00
committed by Android Git Automerger
parent 909a974f8e 656d21656a
commit 556866a2ea
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,8 +245,8 @@ public final class BridgeContext extends Context {
BridgeXmlBlockParser parser = null; BridgeXmlBlockParser parser = null;
if (set instanceof BridgeXmlBlockParser) { if (set instanceof BridgeXmlBlockParser) {
parser = (BridgeXmlBlockParser)set; parser = (BridgeXmlBlockParser)set;
} else { } else if (set != null) { // null parser is ok
// reall this should not be happening since its instantiated in Bridge // really this should not be happening since its instantiated in Bridge
mLogger.error("Parser is not a BridgeXmlBlockParser!"); mLogger.error("Parser is not a BridgeXmlBlockParser!");
return null; return null;
} }
@@ -255,13 +255,16 @@ public final class BridgeContext extends Context {
TreeMap<Integer, String> styleNameMap = searchAttrs(attrs, frameworkAttributes); TreeMap<Integer, String> styleNameMap = searchAttrs(attrs, frameworkAttributes);
BridgeTypedArray ta = ((BridgeResources) mResources).newTypeArray(attrs.length, BridgeTypedArray ta = ((BridgeResources) mResources).newTypeArray(attrs.length,
parser.isPlatformFile()); parser != null ? parser.isPlatformFile() : true);
// resolve the defStyleAttr value into a IStyleResourceValue // resolve the defStyleAttr value into a IStyleResourceValue
IStyleResourceValue defStyleValues = null; IStyleResourceValue defStyleValues = null;
// look for a custom style. // look for a custom style.
String customStyle = parser.getAttributeValue(null /* namespace*/, "style"); String customStyle = null;
if (parser != null) {
customStyle = parser.getAttributeValue(null /* namespace*/, "style");
}
if (customStyle != null) { if (customStyle != null) {
IResourceValue item = findResValue(customStyle); IResourceValue item = findResValue(customStyle);
@@ -308,7 +311,10 @@ public final class BridgeContext extends Context {
int index = styleAttribute.getKey().intValue(); int index = styleAttribute.getKey().intValue();
String name = styleAttribute.getValue(); String name = styleAttribute.getValue();
String value = parser.getAttributeValue(namespace, name); String value = null;
if (parser != null) {
value = parser.getAttributeValue(namespace, name);
}
// if there's no direct value for this attribute in the XML, we look for default // if there's no direct value for this attribute in the XML, we look for default
// values in the widget defStyle, and then in the theme. // values in the widget defStyle, and then in the theme.