Merge "Resolve color xml attributes properly." into lmp-dev

deepanshu- · Android (Google) Code Review · commit b205fa602f50 · 2014-08-11T18:14:57.000Z
diff --git 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 @@ public int getAttributeIntValue(int index, int defaultValue) {
                 value = r.getValue();
             }
 
+            if (value.charAt(0) == '#') {
+                return ResourceHelper.getColor(value);
+            }
             return XmlUtils.convertValueToInt(value, defaultValue);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import com.android.layoutlib.bridge.Bridge;`
`23`	`23`	`import com.android.layoutlib.bridge.BridgeConstants;`
`24`	`24`	`import com.android.layoutlib.bridge.android.BridgeContext;`
	`25`	`+import com.android.layoutlib.bridge.impl.ResourceHelper;`
`25`	`26`	`import com.android.resources.ResourceType;`
`26`	`27`
`27`	`28`	`import org.xmlpull.v1.XmlPullParser;`
`@@ -210,6 +211,9 @@ public int getAttributeIntValue(int index, int defaultValue) {`
`210`	`211`	`value = r.getValue();`
`211`	`212`	`}`
`212`	`213`
	`214`	`+ if (value.charAt(0) == '#') {`
	`215`	`+ return ResourceHelper.getColor(value);`
	`216`	`+ }`
`213`	`217`	`return XmlUtils.convertValueToInt(value, defaultValue);`
`214`	`218`	`}`
`215`	`219`