commit | d96a7403cda1a873e640b6e6395ddab4c2f9b9f9 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Sun Feb 06 21:05:21 2011 -0800 |
committer | Xavier Ducrohet <xav@android.com> | Sun Feb 06 21:05:21 2011 -0800 |
tree | 10fadb724cabbed4c9b36c02412d1cd85c4be4a3 | |
parent | b0d34f9c99cbd43e8238c5952b19d032f02dd168 [diff] |
LayoutLib: Handle color state list in methods returning an int. Change-Id: Ia35ea09b992a239873026c7ef1629a01dd2e6cec
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;