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

am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

Browse Source 
* commit '6c1bf6b161cf3c18b49831eba71811d3fa00d108':
  Resolve color xml attributes properly. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-09-04 04:32:46 +00:00
committed by Android Git Automerger
parent a82db08e1d 6c1bf6b161
commit 338e32ba52
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.Bridge;
import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.BridgeConstants;
import com.android.layoutlib.bridge.android.BridgeContext; import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.impl.ResourceHelper;
import com.android.resources.ResourceType; import com.android.resources.ResourceType;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
@@ -210,6 +211,9 @@ public class BridgeXmlPullAttributes extends XmlPullAttributes {
value = r.getValue(); value = r.getValue();
} }
if (value.charAt(0) == '#') {
return ResourceHelper.getColor(value);
}
return XmlUtils.convertValueToInt(value, defaultValue); return XmlUtils.convertValueToInt(value, defaultValue);
} }