Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f264080d authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

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

* commit '3ce96efc':
  Resolve color xml attributes properly. [DO NOT MERGE]
parents 64d4ef8c 3ce96efc

tools/layoutlib/bridge/src/android/util/BridgeXmlPullAttributes.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

        }