diff options
author | Xavier Ducrohet <xav@android.com> | 2011-02-07 10:18:48 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-07 10:18:48 -0800 |
commit | 62a99c0b3bca70262ab205a5688ff69cbbbaee78 (patch) | |
tree | d9884233cdfcd815560f23652bceca1fac42f54a /tools | |
parent | b0f1cfffd9b201335560c15ffbdcfe12225bac8c (diff) | |
parent | d96a7403cda1a873e640b6e6395ddab4c2f9b9f9 (diff) | |
download | frameworks_base-62a99c0b3bca70262ab205a5688ff69cbbbaee78.zip frameworks_base-62a99c0b3bca70262ab205a5688ff69cbbbaee78.tar.gz frameworks_base-62a99c0b3bca70262ab205a5688ff69cbbbaee78.tar.bz2 |
Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
Diffstat (limited to 'tools')
-rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java | 11 |
1 files changed, 4 insertions, 7 deletions
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 @@ 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; |