commit 0ddd915fb1d0add3bcab269abc1f8f46e2135b7a
author Deepanshu Gupta <deepanshu@google.com> Thu Sep 04 04:14:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 04 04:14:41 2014 +0000
tree 7a33febbd2ef5337940920352817f1bc9fcd9726
parent 1c3a884519dc5937bf321519d6adafb41a333bc1
parent 509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe

am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev

* commit '509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe':
  Resolve color xml attributes properly. [DO NOT MERGE]

tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java

diff --git a/tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java b/tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java
index 6ac5b02..691339e 100644
--- a/tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java
+++ b/tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java
@@ -22,6 +22,7 @@
 import com.android.layoutlib.bridge.Bridge;
 import com.android.layoutlib.bridge.BridgeConstants;
 import com.android.layoutlib.bridge.android.BridgeContext;
+import com.android.layoutlib.bridge.impl.ResourceHelper;
 import com.android.resources.ResourceType;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -210,6 +211,9 @@
                 value = r.getValue();
             }
 
+            if (value.charAt(0) == '#') {
+                return ResourceHelper.getColor(value);
+            }
             return XmlUtils.convertValueToInt(value, defaultValue);
         }