Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

Browse Source 
* commit 'd181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
  Resolve color xml attributes properly. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-09-04 03:18:39 +00:00
committed by Android Git Automerger
parent 638894803c d181ffe688
commit 3ce96efc2c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java
View File

@@ -22,6 +22,7 @@ import com.android.internal.util.XmlUtils;
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 class BridgeXmlPullAttributes extends XmlPullAttributes {
value = r.getValue();
}
if (value.charAt(0) == '#') {
return ResourceHelper.getColor(value);
}
return XmlUtils.convertValueToInt(value, defaultValue);
}