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)
288 lines
8.4 KiB
Java
288 lines
8.4 KiB
Java
/*
|
|
* Copyright (C) 2008 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.util;
|
|
|
|
import com.android.ide.common.rendering.api.RenderResources;
|
|
import com.android.ide.common.rendering.api.ResourceValue;
|
|
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;
|
|
|
|
/**
|
|
* A correct implementation of the {@link AttributeSet} interface on top of a XmlPullParser
|
|
*/
|
|
public class BridgeXmlPullAttributes extends XmlPullAttributes {
|
|
|
|
private final BridgeContext mContext;
|
|
private final boolean mPlatformFile;
|
|
|
|
public BridgeXmlPullAttributes(XmlPullParser parser, BridgeContext context,
|
|
boolean platformFile) {
|
|
super(parser);
|
|
mContext = context;
|
|
mPlatformFile = platformFile;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see android.util.XmlPullAttributes#getAttributeNameResource(int)
|
|
*
|
|
* This methods must return com.android.internal.R.attr.<name> matching
|
|
* the name of the attribute.
|
|
* It returns 0 if it doesn't find anything.
|
|
*/
|
|
@Override
|
|
public int getAttributeNameResource(int index) {
|
|
// get the attribute name.
|
|
String name = getAttributeName(index);
|
|
|
|
// get the attribute namespace
|
|
String ns = mParser.getAttributeNamespace(index);
|
|
|
|
if (BridgeConstants.NS_RESOURCES.equals(ns)) {
|
|
Integer v = Bridge.getResourceId(ResourceType.ATTR, name);
|
|
if (v != null) {
|
|
return v.intValue();
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
// this is not an attribute in the android namespace, we query the customviewloader, if
|
|
// the namespaces match.
|
|
if (mContext.getProjectCallback().getNamespace().equals(ns)) {
|
|
Integer v = mContext.getProjectCallback().getResourceId(ResourceType.ATTR, name);
|
|
if (v != null) {
|
|
return v.intValue();
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeListValue(String namespace, String attribute,
|
|
String[] options, int defaultValue) {
|
|
String value = getAttributeValue(namespace, attribute);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
return XmlUtils.convertValueToList(value, options, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public boolean getAttributeBooleanValue(String namespace, String attribute,
|
|
boolean defaultValue) {
|
|
String value = getAttributeValue(namespace, attribute);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
return XmlUtils.convertValueToBoolean(value, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeResourceValue(String namespace, String attribute, int defaultValue) {
|
|
String value = getAttributeValue(namespace, attribute);
|
|
|
|
return resolveResourceValue(value, defaultValue);
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeIntValue(String namespace, String attribute,
|
|
int defaultValue) {
|
|
String value = getAttributeValue(namespace, attribute);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
return XmlUtils.convertValueToInt(value, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeUnsignedIntValue(String namespace, String attribute,
|
|
int defaultValue) {
|
|
String value = getAttributeValue(namespace, attribute);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
return XmlUtils.convertValueToUnsignedInt(value, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public float getAttributeFloatValue(String namespace, String attribute,
|
|
float defaultValue) {
|
|
String s = getAttributeValue(namespace, attribute);
|
|
if (s != null) {
|
|
ResourceValue r = getResourceValue(s);
|
|
|
|
if (r != null) {
|
|
s = r.getValue();
|
|
}
|
|
|
|
return Float.parseFloat(s);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeListValue(int index,
|
|
String[] options, int defaultValue) {
|
|
return XmlUtils.convertValueToList(
|
|
getAttributeValue(index), options, defaultValue);
|
|
}
|
|
|
|
@Override
|
|
public boolean getAttributeBooleanValue(int index, boolean defaultValue) {
|
|
String value = getAttributeValue(index);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
return XmlUtils.convertValueToBoolean(value, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeResourceValue(int index, int defaultValue) {
|
|
String value = getAttributeValue(index);
|
|
|
|
return resolveResourceValue(value, defaultValue);
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeIntValue(int index, int defaultValue) {
|
|
String value = getAttributeValue(index);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
if (value.charAt(0) == '#') {
|
|
return ResourceHelper.getColor(value);
|
|
}
|
|
return XmlUtils.convertValueToInt(value, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public int getAttributeUnsignedIntValue(int index, int defaultValue) {
|
|
String value = getAttributeValue(index);
|
|
if (value != null) {
|
|
ResourceValue r = getResourceValue(value);
|
|
|
|
if (r != null) {
|
|
value = r.getValue();
|
|
}
|
|
|
|
return XmlUtils.convertValueToUnsignedInt(value, defaultValue);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
@Override
|
|
public float getAttributeFloatValue(int index, float defaultValue) {
|
|
String s = getAttributeValue(index);
|
|
if (s != null) {
|
|
ResourceValue r = getResourceValue(s);
|
|
|
|
if (r != null) {
|
|
s = r.getValue();
|
|
}
|
|
|
|
return Float.parseFloat(s);
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
|
|
// -- private helper methods
|
|
|
|
/**
|
|
* Returns a resolved {@link ResourceValue} from a given value.
|
|
*/
|
|
private ResourceValue getResourceValue(String value) {
|
|
// now look for this particular value
|
|
RenderResources resources = mContext.getRenderResources();
|
|
return resources.resolveResValue(resources.findResValue(value, mPlatformFile));
|
|
}
|
|
|
|
/**
|
|
* Resolves and return a value to its associated integer.
|
|
*/
|
|
private int resolveResourceValue(String value, int defaultValue) {
|
|
ResourceValue resource = getResourceValue(value);
|
|
if (resource != null) {
|
|
Integer id = null;
|
|
if (mPlatformFile || resource.isFramework()) {
|
|
id = Bridge.getResourceId(resource.getResourceType(), resource.getName());
|
|
} else {
|
|
id = mContext.getProjectCallback().getResourceId(
|
|
resource.getResourceType(), resource.getName());
|
|
}
|
|
|
|
if (id != null) {
|
|
return id;
|
|
}
|
|
}
|
|
|
|
return defaultValue;
|
|
}
|
|
}
|