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

Add support for aapt:attr attributes

Browse Source 
Test: Tested from the studio side
Change-Id: Id506801f53cfc976c7352bd7f9632804862668b7
This commit is contained in:
Diego Perez
2016-11-21 17:01:50 +00:00
parent 8dba8afc65
commit bc9d2a13f0
3 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@@ -638,6 +638,9 @@ public final class BridgeTypedArray extends TypedArray {
return mContext.getProjectResourceValue(ResourceType.ID, idName, defValue);
}
}
else if (value.startsWith("@aapt:_aapt")) {
return mContext.getLayoutlibCallback().getResourceId(ResourceType.AAPT, value);
}
// not a direct id valid reference. First check if it's an enum (this is a corner case
// for attributes that have a reference|enum type), then fallback to resolve

11
tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java
View File

@@ -131,9 +131,16 @@ public class Resources_Delegate {
if (resourceInfo != null) {
String attributeName = resourceInfo.getSecond();
RenderResources renderResources = resources.mContext.getRenderResources();
return Pair.of(attributeName, platformResFlag_out[0] ?
ResourceValue value = platformResFlag_out[0] ?
renderResources.getFrameworkResource(resourceInfo.getFirst(), attributeName) :
renderResources.getProjectResource(resourceInfo.getFirst(), attributeName));
renderResources.getProjectResource(resourceInfo.getFirst(), attributeName);
if (value == null) {
// Unable to resolve the attribute, just leave the unresolved value
value = new ResourceValue(resourceInfo.getFirst(), attributeName, attributeName,
platformResFlag_out[0]);
}
return Pair.of(attributeName, value);
}
return null;

53
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java
View File

@@ -286,18 +286,15 @@ public final class ResourceHelper {
Density density = Density.MEDIUM;
if (value instanceof DensityBasedResourceValue) {
density =
((DensityBasedResourceValue)value).getResourceDensity();
density = ((DensityBasedResourceValue) value).getResourceDensity();
}
if (lowerCaseValue.endsWith(NinePatch.EXTENSION_9PATCH)) {
File file = new File(stringValue);
if (file.isFile()) {
try {
return getNinePatchDrawable(
new FileInputStream(file), density, value.isFramework(),
stringValue, context);
return getNinePatchDrawable(new FileInputStream(file), density,
value.isFramework(), stringValue, context);
} catch (IOException e) {
// failed to read the file, we'll return null below.
Bridge.getLog().error(LayoutLog.TAG_RESOURCES_READ,
@@ -306,30 +303,28 @@ public final class ResourceHelper {
}
return null;
} else if (lowerCaseValue.endsWith(".xml")) {
} else if (lowerCaseValue.endsWith(".xml") || stringValue.startsWith("@aapt:_aapt/")) {
// create a block parser for the file
File f = new File(stringValue);
if (f.isFile()) {
try {
// let the framework inflate the Drawable from the XML file.
XmlPullParser parser = ParserFactory.create(f);
BridgeXmlBlockParser blockParser = new BridgeXmlBlockParser(
parser, context, value.isFramework());
try {
return Drawable.createFromXml(context.getResources(), blockParser, theme);
} finally {
blockParser.ensurePopped();
try {
XmlPullParser parser = context.getLayoutlibCallback().getParser(value);
if (parser == null) {
File drawableFile = new File(stringValue);
if (drawableFile.isFile()) {
parser = ParserFactory.create(drawableFile);
}
} catch (Exception e) {
// this is an error and not warning since the file existence is checked before
// attempting to parse it.
Bridge.getLog().error(null, "Failed to parse file " + stringValue,
e, null /*data*/);
}
} else {
Bridge.getLog().error(LayoutLog.TAG_BROKEN,
String.format("File %s does not exist (or is not a file)", stringValue),
BridgeXmlBlockParser blockParser =
new BridgeXmlBlockParser(parser, context, value.isFramework());
try {
return Drawable.createFromXml(context.getResources(), blockParser, theme);
} finally {
blockParser.ensurePopped();
}
} catch (Exception e) {
// this is an error and not warning since the file existence is checked before
// attempting to parse it.
Bridge.getLog().error(null, "Failed to parse file " + stringValue, e,
null /*data*/);
}
@@ -342,8 +337,8 @@ public final class ResourceHelper {
value.isFramework() ? null : context.getProjectKey());
if (bitmap == null) {
bitmap = Bitmap_Delegate.createBitmap(bmpFile, false /*isMutable*/,
density);
bitmap =
Bitmap_Delegate.createBitmap(bmpFile, false /*isMutable*/, density);
Bridge.setCachedBitmap(stringValue, bitmap,
value.isFramework() ? null : context.getProjectKey());
}