am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
* commit '62a99c0b3bca70262ab205a5688ff69cbbbaee78':
LayoutLib: Handle color state list in methods returning an int.
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
index c226b8b..15c4f44 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
@@ -270,13 +270,10 @@
return defValue;
}
- String s = mResourceData[index].getValue();
- try {
- return ResourceHelper.getColor(s);
- } catch (NumberFormatException e) {
- Bridge.getLog().error(LayoutLog.TAG_RESOURCES_FORMAT, e.getMessage(), e, null /*data*/);
-
- // we'll return the default value below.
+ ColorStateList colorStateList = ResourceHelper.getColorStateList(
+ mResourceData[index], mContext);
+ if (colorStateList != null) {
+ return colorStateList.getDefaultColor();
}
return defValue;