summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-10-07 07:16:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-07 07:16:51 -0700
commit556866a2ea1f4758a79fe4f207153b71815ed400 (patch)
treed1e1e04500d7ffff4be687ab2e6cf36ad68cbc9b /tools
parent909a974f8e5df4b6fc2cf8de6c64633406095c6e (diff)
parent656d21656ad9b33f7d7e1e4960a2f03076a5fc7a (diff)
downloadframeworks_base-556866a2ea1f4758a79fe4f207153b71815ed400.zip
frameworks_base-556866a2ea1f4758a79fe4f207153b71815ed400.tar.gz
frameworks_base-556866a2ea1f4758a79fe4f207153b71815ed400.tar.bz2
am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread
Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp * commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a': Parser is optional in obtainStyledAttributes.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
index 744bfbe..d5a90e6 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
@@ -245,8 +245,8 @@ public final class BridgeContext extends Context {
BridgeXmlBlockParser parser = null;
if (set instanceof BridgeXmlBlockParser) {
parser = (BridgeXmlBlockParser)set;
- } else {
- // reall this should not be happening since its instantiated in Bridge
+ } else if (set != null) { // null parser is ok
+ // really this should not be happening since its instantiated in Bridge
mLogger.error("Parser is not a BridgeXmlBlockParser!");
return null;
}
@@ -255,13 +255,16 @@ public final class BridgeContext extends Context {
TreeMap<Integer, String> styleNameMap = searchAttrs(attrs, frameworkAttributes);
BridgeTypedArray ta = ((BridgeResources) mResources).newTypeArray(attrs.length,
- parser.isPlatformFile());
+ parser != null ? parser.isPlatformFile() : true);
// resolve the defStyleAttr value into a IStyleResourceValue
IStyleResourceValue defStyleValues = null;
// 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) {
IResourceValue item = findResValue(customStyle);
@@ -308,7 +311,10 @@ public final class BridgeContext extends Context {
int index = styleAttribute.getKey().intValue();
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
// values in the widget defStyle, and then in the theme.