commit a780eee46244062d699f76875fd05775c2ee92de
author Deepanshu Gupta <deepanshu@google.com> Thu Sep 04 01:53:37 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 01:53:38 2014 +0000
tree 0367d4be392d136501f8742162c5fcbeb0cae247
parent 9776312a80f0072bf1d1fe8183e168f7d5879c4c
parent cc7ccc3fc1ea8e287a532b34d4d54ec97bf5aaa8

Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev

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);
         }