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

Commit f2e26413 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Resolve color xml attributes properly. [DO NOT MERGE] 

Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
(cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)
parent 505c675c

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);

        }