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

Merge "Add namespace before attr name in defPropMap" into nyc-dev am: 4c5e7a740a

Browse Source 
am: e47c4aec7d

* commit 'e47c4aec7d8e1ab2d0c30c95b3951a8e2367a4b2':
  Add namespace before attr name in defPropMap

Change-Id: I4acb3c65e3e0012fed50b2571fede7504ec42a86
This commit is contained in:
Deepanshu Gupta
2016-04-29 20:12:53 +00:00
committed by android-build-merger
parent f593ca4d3d e47c4aec7d
commit 6291e0ba4f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -861,7 +861,9 @@ public final class BridgeContext extends Context {
resValue = mRenderResources.resolveResValue(resValue);
if (defaultPropMap != null) {
defaultPropMap.put(attrName,
defaultPropMap.put(
frameworkAttr ? SdkConstants.PREFIX_ANDROID + attrName :
attrName,
new Property(preResolve, resValue.getValue()));
}
@@ -932,7 +934,8 @@ public final class BridgeContext extends Context {
@Nullable StyleResourceValue style, int[] attrs) throws Resources.NotFoundException {
List<Pair<String, Boolean>> attributes = searchAttrs(attrs);
BridgeTypedArray ta = Resources_Delegate.newTypeArray(mSystemResources, attrs.length, false);
BridgeTypedArray ta =
Resources_Delegate.newTypeArray(mSystemResources, attrs.length, false);
PropertiesMap defaultPropMap = new PropertiesMap();
// for each attribute, get its name so that we can search it in the style
@@ -943,11 +946,11 @@ public final class BridgeContext extends Context {
// look for the value in the given style
ResourceValue resValue;
String attrName = attribute.getFirst();
boolean frameworkAttr = attribute.getSecond();
if (style != null) {
resValue = mRenderResources.findItemInStyle(style, attrName,
attribute.getSecond());
resValue = mRenderResources.findItemInStyle(style, attrName, frameworkAttr);
} else {
resValue = mRenderResources.findItemInTheme(attrName, attribute.getSecond());
resValue = mRenderResources.findItemInTheme(attrName, frameworkAttr);
}
if (resValue != null) {
@@ -955,8 +958,10 @@ public final class BridgeContext extends Context {
String preResolve = resValue.getValue();
// resolve it to make sure there are no references left.
resValue = mRenderResources.resolveResValue(resValue);
ta.bridgeSetValue(i, attrName, attribute.getSecond(), resValue);
defaultPropMap.put(attrName, new Property(preResolve, resValue.getValue()));
ta.bridgeSetValue(i, attrName, frameworkAttr, resValue);
defaultPropMap.put(
frameworkAttr ? SdkConstants.ANDROID_PREFIX + attrName : attrName,
new Property(preResolve, resValue.getValue()));
}
}
}