From d96a7403cda1a873e640b6e6395ddab4c2f9b9f9 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Sun, 6 Feb 2011 21:05:21 -0800
Subject: [PATCH] LayoutLib: Handle color state list in methods returning an
 int.

Change-Id: Ia35ea09b992a239873026c7ef1629a01dd2e6cec
---
 .../layoutlib/bridge/android/BridgeTypedArray.java    | 11 ++++-------
 1 file 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 c226b8b54f91c..15c4f4422a3cf 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;