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

Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb

Browse Source
This commit is contained in:
Xavier Ducrohet
2011-02-07 10:18:48 -08:00
committed by Android (Google) Code Review
parent b0f1cfffd9 d96a7403cd
commit 62a99c0b3b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
View File

@@ -270,13 +270,10 @@ public final class BridgeTypedArray extends TypedArray {
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;