diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 05:32:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 05:32:41 +0000 |
| commit | ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae (patch) | |
| tree | 14b715de9587f5ba917dc29747f0adc225715e82 /tools/layoutlib/bridge/src/android | |
| parent | e9ea028b74950722163560d5dfb97b4403111cc4 (diff) | |
| parent | 1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5 (diff) | |
| download | frameworks_base-ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae.zip frameworks_base-ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae.tar.gz frameworks_base-ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae.tar.bz2 | |
am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'tools/layoutlib/bridge/src/android')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java | 4 |
1 files changed, 4 insertions, 0 deletions
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.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); } |